Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue with java 10 not being able to find javafx ant jar #128

Open
wants to merge 1 commit into
base: newyear2018release
Choose a base branch
from
Open

fixed issue with java 10 not being able to find javafx ant jar #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/de/dynamicfiles/projects/gradle/plugins/javafx/JavaFXGradlePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 2 additions & 1 deletion ...ava/de/dynamicfiles/projects/gradle/plugins/javafx/tasks/internal/JavaDetectionTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down