Add javafx version number + update javafx (#7312)

Remove java 9 check classes
JabRef · Jan 7, 2021 · aef49f4 · aef49f4
1 parent c651e45
commit aef49f4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 163 deletions.
diff --git a/build.gradle b/build.gradle
@@ -88,7 +88,7 @@ configurations {
 }
 
 javafx {
-    version = "15"
+    version = "15.0.1"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 

diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -58,8 +58,8 @@ public AboutDialogViewModel(DialogService dialogService, ClipBoardManager clipBo
         authors.set(buildInfo.authors);
         license.set(Localization.lang("License") + ":");
         changelogUrl = buildInfo.version.getChangelogUrl();
-        versionInfo = String.format("JabRef %s%n%s %s %s %nJava %s", buildInfo.version, BuildInfo.OS,
-                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION);
+        versionInfo = String.format("JabRef %s%n%s %s %s %nJava %s %nJavaFX %s", buildInfo.version, BuildInfo.OS,
+                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION, BuildInfo.JAVAFX_VERSION);
     }
 
     public String getDevelopmentVersion() {

diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -16,6 +16,8 @@ public final class BuildInfo {
     public static final String OS_VERSION = System.getProperty("os.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
     public static final String OS_ARCH = System.getProperty("os.arch", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
     public static final String JAVA_VERSION = System.getProperty("java.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+    public static final String JAVAFX_VERSION = System.getProperty("javafx.runtime.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+
 
     public final Version version;
     public final String authors;

diff --git a/src/main/java/org/jabref/logic/util/JavaVersion.java b/src/main/java/org/jabref/logic/util/JavaVersion.java
diff --git a/src/test/java/org/jabref/logic/util/JavaVersionTest.java b/src/test/java/org/jabref/logic/util/JavaVersionTest.java