# HG changeset patch
# User kcr
# Date 1459966459 25200
# Node ID d2ce42ec9be10ef8470031b379994eb243035a28
# Parent  2bd05a7ef9cc9c5a5ccd62d8dd997d9736252d4d
8153539: JavaFX build script checking order for jfxrt.jar is non-deterministic
Reviewed-by:

diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -1264,6 +1264,9 @@
         }
     }
 
+    compileJava.dependsOn verifyJava
+    compileJava.dependsOn checkJfxrtJar
+
     // Compile and run tests against the jfxrt.jar in the built sdk of the host machine
     def sdkDir = "${rootProject.buildDir}/sdk"
     def jfxrtJar = "$sdkDir/lib/jfxrt.jar"
@@ -1369,9 +1372,6 @@
         }
     }
 
-    compileJava.dependsOn updateCacheIfNeeded
-    compileJava.dependsOn verifyJava
-
     // Make sure to include $buildDir/generated-src/version-info that we previously created.
     // We DO NOT want to include src/main/version-info
     if (System.getProperty("jfx.build.jdk.defenders", "true").equals("true")) {
@@ -2313,6 +2313,8 @@
         compile BUILD_SRC, project(":base"), project(":graphics")
     }
 
+    compileJava.dependsOn updateCacheIfNeeded
+
     sourceSets {
         tools {
             java.srcDir "src/tools/java"
@@ -2623,6 +2625,8 @@
         compile project(":base"), project(":graphics"), project(":controls"), project(":media")
     }
 
+    compileJava.dependsOn updateCacheIfNeeded
+
     test {
         if (!IS_JIGSAW_TEST) {
         //TODO: support this in Jake
@@ -3031,8 +3035,6 @@
 }
 
 task sdk() {
-    dependsOn(checkJfxrtJar)
-
     if (DO_BUILD_SDK_FOR_TEST) {
         rootProject.getTasksByName("test", true).each { t ->
             if (t.enabled) t.dependsOn(sdk)