diff options
Diffstat (limited to 'java/openjfx8-devel/files/patch-build.gradle')
| -rw-r--r-- | java/openjfx8-devel/files/patch-build.gradle | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/java/openjfx8-devel/files/patch-build.gradle b/java/openjfx8-devel/files/patch-build.gradle index de544a023117..4293bae728ff 100644 --- a/java/openjfx8-devel/files/patch-build.gradle +++ b/java/openjfx8-devel/files/patch-build.gradle @@ -9,21 +9,23 @@ def keySplit = property.key.split("\\."); def key = keySplit[0]; for (int i = 1; i < keySplit.length; i++) { -@@ -1167,7 +1167,7 @@ allprojects { +@@ -1167,7 +1167,8 @@ allprojects { // By default all of our projects require junit for testing so we can just // setup this dependency here. dependencies { - testCompile group: "junit", name: "junit", version: "4.8.2" -+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar") ++ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar", ++ "%%PREFIX%%/share/java/classes/hamcrest.jar") if (BUILD_CLOSED && DO_JCOV) { testCompile name: "jcov" } -@@ -1307,11 +1307,9 @@ project(":graphics") { +@@ -1307,11 +1308,10 @@ project(":graphics") { dependencies { compile project(":base"), BUILD_SRC compile files("/usr/local/share/java/classes/swt-devel.jar") - stubCompile group: "junit", name: "junit", version: "4.8.2", -+ stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar"), ++ stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar", ++ "%%PREFIX%%/share/java/classes/hamcrest.jar"), project(":base").sourceSets.test.output, sourceSets.main.output - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" @@ -32,7 +34,7 @@ } // Create a single "native" task which will depend on all the individual native tasks for graphics -@@ -1601,9 +1599,7 @@ project(":graphics") { +@@ -1601,9 +1601,7 @@ project(":graphics") { copy { into libsDir from f.getParentFile() @@ -43,7 +45,7 @@ includeEmptyDirs = false } // Have to rename the swt jar because it is some platform specific name but -@@ -1787,7 +1783,7 @@ project(":fxpackager") { +@@ -1787,7 +1785,7 @@ project(":fxpackager") { } dependencies { @@ -52,7 +54,7 @@ } // When producing the jar, we need to relocate a few class files -@@ -2048,21 +2044,6 @@ project(":fxpackager") { +@@ -2048,21 +2046,6 @@ project(":fxpackager") { jar.dependsOn buildJavaPackager jar.dependsOn packagerJar |