Merge pull request #4337 from cwisniew/fix-windows-dup-filename

RPTools · Oct 20, 2023 · 149696d · 149696d
2 parents 3ffc92f + b137193
commit 149696d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -138,7 +138,8 @@ sourceSets {
 run {
     args = ['-v=' + appSemVer]
     applicationDefaultJvmArgs = ["-Xss8M", "-Dsun.java2d.d3d=false", "-Dsentry.environment=Development", "-Dfile.encoding=UTF-8",
-                                 "-Dpolyglot.engine.WarnInterpreterOnly=false","-DRUN_FROM_IDE=true",
+                                 "-Dpolyglot.engine.WarnInterpreterOnly=false", "-DRUN_FROM_IDE=true",
+                                 "-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",
@@ -227,6 +228,7 @@ runtime {
         installerOutputDir = file("releases")
         jvmArgs = ["-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",