Merge branch 'develop' into feature-java-21

cwisniew · Nov 19, 2023 · 044e8a5 · 044e8a5
2 parents d4b10e4 + ef715a6
commit 044e8a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -36,6 +36,7 @@ java {
 def javaArgs = [
         "-Xss8M", "-Dsun.java2d.d3d=false", "-Dsentry.environment=Production", "-Dfile.encoding=UTF-8",
         "-Dpolyglot.engine.WarnInterpreterOnly=false",
+        "-Djava.util.Arrays.useLegacyMergeSort=true",
         "-DMAPTOOL_DATADIR=.maptool-" + vendor.toLowerCase(), "-XX:+ShowCodeDetailsInExceptionMessages",
         "--add-opens=java.desktop/java.awt=ALL-UNNAMED", "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED",
         "--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED",
@@ -137,7 +138,7 @@ spotless {
 
 // org.openjfx.javafxplugin
 javafx {
-    version = '20'
+    version = '21'
     // modules = ['javafx.fxml', 'javafx.graphics']
     modules = ['javafx.base', 'javafx.controls', 'javafx.media', 'javafx.swing', 'javafx.web', 'javafx.fxml', 'javafx.graphics']
 }

diff --git a/src/main/java/net/rptools/maptool/client/AppUtil.java b/src/main/java/net/rptools/maptool/client/AppUtil.java
@@ -216,6 +216,11 @@ public static Path getInstallDirectory() {
       path = path.getParent().getParent().getParent();
     } else { // First try to find MapTool* directory in path
       while (path != null) {
+        if (path.getFileName() == null) {
+          // We have gone too far!
+          path = null;
+          break;
+        }
         if (path.getFileName().toString().matches("(?i).*maptool.*")) {
           break;
         }