Merge branch 'upstream' into mapping-io

10 files changed, 62 insertions, 44 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2fbb3a6..64108e6c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,13 +4,13 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ 17-jdk, 19-jdk ]
+        java: [ 17-ubuntu, 21-ubuntu ]
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:${{ matrix.java }}
+      image: mcr.microsoft.com/openjdk/jdk:${{ matrix.java }}
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./gradlew build --stacktrace --warning-mode fail
       - uses: Juuxel/publish-checkstyle-report@v1
         if: ${{ failure() }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 87fd901a..5a5d0b4b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,10 +4,10 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:19-jdk
+      image: mcr.microsoft.com/openjdk/jdk:21-ubuntu
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./gradlew checkVersion build publish --stacktrace
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
diff --git a/build.gradle b/build.gradle
index 8cbe0cd6..b89f1b59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
         id 'maven-publish'
+        id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 subprojects {
@@ -7,9 +8,6 @@ subprojects {
         apply plugin: 'maven-publish'
         apply plugin: 'checkstyle'
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-
         repositories {
                 mavenLocal()
                 mavenCentral()
@@ -17,8 +15,8 @@ subprojects {
         }
 
         dependencies {
-                implementation 'com.google.guava:guava:30.1.1-jre'
-                implementation 'com.google.code.gson:gson:2.8.7'
+                implementation 'com.google.guava:guava:32.1.2-jre'
+                implementation 'com.google.code.gson:gson:2.10.1'
                 implementation 'net.fabricmc:mapping-io:0.5.0'
                 
                 compileOnly 'org.jetbrains:annotations:24.0.1'
@@ -32,13 +30,10 @@ subprojects {
 
         version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local")
 
-        task sourcesJar(type: Jar, dependsOn: classes) {
-                classifier = 'sources'
-                from sourceSets.main.allSource
-        }
-
         java {
                 withSourcesJar()
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
         }
 
         tasks.withType(JavaCompile).configureEach {
@@ -49,7 +44,7 @@ subprojects {
 
         checkstyle {
                 configFile = rootProject.file('checkstyle.xml')
-                toolVersion = '10.3.3'
+                toolVersion = '10.12.4'
         }
 
         publishing {
diff --git a/enigma-cli/build.gradle b/enigma-cli/build.gradle
index 5281e9e6..05e644e1 100644
--- a/enigma-cli/build.gradle
+++ b/enigma-cli/build.gradle
@@ -1,15 +1,17 @@
 plugins {
         id 'application'
-        id 'com.github.johnrengelman.shadow' version '7.0.0'
+        id 'com.github.johnrengelman.shadow'
 }
 
 dependencies {
         implementation project(':enigma')
 }
 
-mainClassName = 'cuchaz.enigma.command.Main'
+application {
+        mainClass = 'cuchaz.enigma.command.Main'
+}
 
-jar.manifest.attributes 'Main-Class': mainClassName
+jar.manifest.attributes 'Main-Class': application.mainClass.get()
 
 publishing {
         publications {
diff --git a/enigma-server/build.gradle b/enigma-server/build.gradle
index 873adb90..0daa490e 100644
--- a/enigma-server/build.gradle
+++ b/enigma-server/build.gradle
@@ -7,6 +7,8 @@ dependencies {
         implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
 }
 
-mainClassName = 'cuchaz.enigma.network.DedicatedEnigmaServer'
+application {
+        mainClass = 'cuchaz.enigma.network.DedicatedEnigmaServer'
+}
 
-jar.manifest.attributes 'Main-Class': mainClassName
+jar.manifest.attributes 'Main-Class': application.mainClass.get()
diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle
index fff4dafe..452df5e7 100644
--- a/enigma-swing/build.gradle
+++ b/enigma-swing/build.gradle
@@ -1,23 +1,36 @@
 plugins {
         id 'application'
-        id 'com.github.johnrengelman.shadow' version '7.0.0'
+        id 'com.github.johnrengelman.shadow'
 }
 
+def flatLafNatives = [
+                "windows-arm64@dll",
+                "windows-x86@dll",
+                "windows-x86_64@dll",
+                "linux-x86_64@so",
+]
+
 dependencies {
         implementation project(':enigma')
         implementation project(':enigma-server')
 
         implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-        implementation 'com.formdev:flatlaf:2.6'
-        implementation 'com.formdev:flatlaf-extras:2.6' // for SVG icons
+        implementation 'com.formdev:flatlaf:3.2.5'
+        implementation 'com.formdev:flatlaf-extras:3.2.5' // for SVG icons
         implementation 'de.sciss:syntaxpane:1.2.1'
         implementation 'com.github.lukeu:swing-dpi:0.10'
         implementation 'org.drjekyll:fontchooser:2.5.2'
+
+        flatLafNatives.forEach {
+                implementation 'com.formdev:flatlaf:3.2.5:' + it
+        }
 }
 
-mainClassName = 'cuchaz.enigma.gui.Main'
+application {
+        mainClass = 'cuchaz.enigma.gui.Main'
+}
 
-jar.manifest.attributes 'Main-Class': mainClassName
+jar.manifest.attributes 'Main-Class': application.mainClass.get()
 
 publishing {
         publications {
diff --git a/enigma/build.gradle b/enigma/build.gradle
index 8cbfec28..cabea135 100644
--- a/enigma/build.gradle
+++ b/enigma/build.gradle
@@ -3,15 +3,15 @@ configurations {
 }
 
 dependencies {
-        implementation 'org.ow2.asm:asm:9.4'
-        implementation 'org.ow2.asm:asm-commons:9.4'
-        implementation 'org.ow2.asm:asm-tree:9.4'
-        implementation 'org.ow2.asm:asm-util:9.4'
+        implementation 'org.ow2.asm:asm:9.6'
+        implementation 'org.ow2.asm:asm-commons:9.6'
+        implementation 'org.ow2.asm:asm-tree:9.6'
+        implementation 'org.ow2.asm:asm-util:9.6'
 
         implementation 'org.bitbucket.mstrobel:procyon-compilertools:0.6.0'
         implementation 'net.fabricmc:cfr:0.2.1'
 
-        proGuard 'com.guardsquare:proguard-base:7.3.0'
+        proGuard 'com.guardsquare:proguard-base:7.4.0-beta02'
 
         testImplementation 'com.google.jimfs:jimfs:1.2'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbf..7f93135c 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c..3fa8f862 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \