From 7b816f72f5bb4a0f8b7b263f8d90149f79818493 Mon Sep 17 00:00:00 2001 From: Daniel Gillespie Date: Sun, 8 Jul 2018 08:48:01 -0700 Subject: [PATCH] fixed issue with java 10 not being able to find javafx ant jar due to relative path issue --- .../projects/gradle/plugins/javafx/JavaFXGradlePlugin.java | 2 +- .../plugins/javafx/tasks/internal/JavaDetectionTools.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java index 1047a8e..3606e98 100644 --- a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java +++ b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java @@ -100,7 +100,7 @@ private void addJavaFXAntJARToGradleBuildpath(Project project) { String jfxAntJarPath = "/../lib/" + ANT_JAVAFX_JAR_FILENAME; // on java 9, we have a different path - if( JavaDetectionTools.IS_JAVA_9 ){ + if( JavaDetectionTools.IS_JAVA_9 || JavaDetectionTools.IS_JAVA_10 ){ jfxAntJarPath = "/lib/" + ANT_JAVAFX_JAR_FILENAME; } diff --git a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/internal/JavaDetectionTools.java b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/internal/JavaDetectionTools.java index e77f94b..a79a3b7 100644 --- a/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/internal/JavaDetectionTools.java +++ b/src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/internal/JavaDetectionTools.java @@ -21,7 +21,8 @@ public class JavaDetectionTools { public static final boolean IS_JAVA_8 = isJavaVersion(8); - public static final boolean IS_JAVA_9 = !IS_JAVA_8 && isJavaVersion(9) || isJavaVersion(9, true); + public static final boolean IS_JAVA_9 = !IS_JAVA_8 && (isJavaVersion(9) || isJavaVersion(9, true)); + public static final boolean IS_JAVA_10 = !IS_JAVA_8 && !IS_JAVA_9 && (isJavaVersion(10) || isJavaVersion(10, true)); public static boolean isJavaVersion(int oracleJavaVersion, boolean noVersionOne) { String javaVersion = System.getProperty("java.version");