[pull] master from runelite:master

.github/workflows/CI.yml

@@ -12,20 +12,13 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: 'true'
-    - name: cache
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-cache-
-    - run: choco install innosetup --version 6.3.3
+    - run: choco install innosetup --version 6.4.0
     - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
+        cache: gradle
     - uses: ilammy/msvc-dev-cmd@v1 # for nmake
       with:
         arch: x64
@@ -51,7 +44,7 @@ jobs:
         cd detours/src
         nmake
     - name: build launcher
-      run: mvn verify -B -P $env:RUNELITE_PROFILE
+      run: ./gradlew build -P RUNELITE_BUILD=$env:RUNELITE_PROFILE --no-daemon
     - name: x64 installer
       shell: bash
       run: ./build-win64.sh
@@ -77,29 +70,22 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: 'true'
-    - name: cache
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-cache-
     - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
+        cache: gradle
     - name: build
-      run: mvn verify -B -P $RUNELITE_PROFILE
+      run: ./gradlew build -P RUNELITE_BUILD=$RUNELITE_PROFILE
     - name: linux-x64
       run: ./build-linux-x86_64.sh
     - name: linux-aarch64
       run: ./build-linux-aarch64.sh
     - uses: actions/upload-artifact@v4
       with:
         name: jar
-        path: target/RuneLite.jar
+        path: build/libs/RuneLite.jar
         if-no-files-found: error
     - uses: actions/upload-artifact@v4
       with:
@@ -109,29 +95,22 @@ jobs:
           RuneLite-aarch64.AppImage
         if-no-files-found: error
   macos:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
     - uses: actions/checkout@v4
       with:
         submodules: 'true'
-    - name: cache
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.m2/repository
-        key: ${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-cache-
     - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
+        cache: gradle
     - name: build
-      run: mvn verify -B -P $RUNELITE_PROFILE
+      run: ./gradlew build -P RUNELITE_BUILD=$RUNELITE_PROFILE
     - name: clone create-dmg
       run: git clone https://github.com/runelite/create-dmg -b runelite-1.0
     - name: build create-dmg
@@ -161,4 +140,4 @@ jobs:
         name: macos-app
         path: |
           app.tar
-        if-no-files-found: error
+        if-no-files-found: error

.gitignore

@@ -1,12 +1,4 @@
-target
-nbactions.xml
-nb-configuration.xml
-/nbproject/
-project.properties
-*.iml
-.idea/
-.project
-.settings/
-.classpath
-dependency-reduced-pom.xml
+.gradle
+build
+.idea
 RuneLiteSetup*.exe

.jdk-versions.sh

@@ -1,28 +1,28 @@
 # windows x64
-WIN64_VERSION=11.0.24+8
-WIN64_CHKSUM=78e10f7d025898b7dc7436b2bb986570283cca3cb4a654991a4f9671231da536
-WIN64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.zip
+WIN64_VERSION=11.0.25+9
+WIN64_CHKSUM=052f09448d5b8d9afb7a8e5049d40d7fafa8f5884afe6043bb2359787fd41e84
+WIN64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_windows_hotspot_11.0.25_9.zip
 # windows x86
-WIN32_VERSION=11.0.24+8
-WIN32_CHKSUM=fa9a6abdc28c4190a101ee8ab56c78426337007d391f063b9c24ec944eff80f6
-WIN32_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.24_8.zip
+WIN32_VERSION=11.0.25+9
+WIN32_CHKSUM=ac760b5ed1cb96acb51b5feb8c04e2c200921a56ff6ab012a81c190c3c80778d
+WIN32_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.25_9.zip
 # windows aarch64
-WIN_AARCH64_VERSION=11.0.24+8
-WIN_AARCH64_CHKSUM=bac491e89078ba88e8a4c85fb1458c9821670126359101e555818623baf0432a
-WIN_AARCH64_LINK=https://aka.ms/download-jdk/microsoft-jdk-11.0.24-windows-aarch64.zip
+WIN_AARCH64_VERSION=11.0.25+9
+WIN_AARCH64_CHKSUM=6dbd8b0966c84a0f65a2b61a4e10543f8326e815497b8092cbcda409a706feee
+WIN_AARCH64_LINK=https://aka.ms/download-jdk/microsoft-jdk-11.0.25-windows-aarch64.zip
 # mac x64
-MAC_AMD64_VERSION=17.0.12+7
-MAC_AMD64_CHKSUM=331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510
-MAC_AMD64_LINK=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz
+MAC_AMD64_VERSION=17.0.13+11
+MAC_AMD64_CHKSUM=bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78
+MAC_AMD64_LINK=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz
 # mac aarch64
-MAC_AARCH64_VERSION=17.0.12+7
-MAC_AARCH64_CHKSUM=5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf
-MAC_AARCH64_LINK=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz
+MAC_AARCH64_VERSION=17.0.13+11
+MAC_AARCH64_CHKSUM=a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907
+MAC_AARCH64_LINK=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz
 # linux x64
-LINUX_AMD64_VERSION=11.0.24+8
-LINUX_AMD64_CHKSUM=e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5
-LINUX_AMD64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz
+LINUX_AMD64_VERSION=11.0.25+9
+LINUX_AMD64_CHKSUM=84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3
+LINUX_AMD64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz
 # linux aarch64
-LINUX_AARCH64_VERSION=11.0.24+8
-LINUX_AARCH64_CHKSUM=1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597
-LINUX_AARCH64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz
+LINUX_AARCH64_VERSION=11.0.25+9
+LINUX_AARCH64_CHKSUM=e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9
+LINUX_AARCH64_LINK=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz

appimage/runelite.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=${project.build.finalName}
-Comment=${project.description}
-Exec=${project.build.finalName}
+Name=${project.finalName}
+Comment=${project.launcherDescription}
+Exec=${project.finalName}
 Icon=runelite
 Terminal=false
 Type=Application

build-linux-aarch64.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+echo Launcher sha256sum
+sha256sum build/libs/RuneLite.jar
+
 pushd native
 cmake -DCMAKE_TOOLCHAIN_FILE=arm64-linux-gcc.cmake -B build-aarch64 .
 cmake --build build-aarch64 --config Release
@@ -25,12 +28,12 @@ echo "$LINUX_AARCH64_CHKSUM linux_aarch64_jre.tar.gz" | sha256sum -c
 # Note: Host umask may have checked out this directory with g/o permissions blank
 chmod -R u=rwX,go=rX appimage
 # ...ditto for the build process
-chmod 644 target/RuneLite.jar
+chmod 644 build/libs/RuneLite.jar
 
 cp native/build-aarch64/src/RuneLite build/linux-aarch64/
-cp target/RuneLite.jar build/linux-aarch64/
+cp build/libs/RuneLite.jar build/linux-aarch64/
 cp packr/linux-aarch64-config.json build/linux-aarch64/config.json
-cp target/filtered-resources/runelite.desktop build/linux-aarch64/
+cp build/filtered-resources/runelite.desktop build/linux-aarch64/
 cp appimage/runelite.png build/linux-aarch64/
 
 tar zxf linux_aarch64_jre.tar.gz

build-linux-x86_64.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+echo Launcher sha256sum
+sha256sum build/libs/RuneLite.jar
+
 pushd native
 cmake -B build-x64 .
 cmake --build build-x64 --config Release
@@ -25,12 +28,12 @@ echo "$LINUX_AMD64_CHKSUM linux64_jre.tar.gz" | sha256sum -c
 # Note: Host umask may have checked out this directory with g/o permissions blank
 chmod -R u=rwX,go=rX appimage
 # ...ditto for the build process
-chmod 644 target/RuneLite.jar
+chmod 644 build/libs/RuneLite.jar
 
 cp native/build-x64/src/RuneLite build/linux-x64/
-cp target/RuneLite.jar build/linux-x64/
+cp build/libs/RuneLite.jar build/linux-x64/
 cp packr/linux-x64-config.json build/linux-x64/config.json
-cp target/filtered-resources/runelite.desktop build/linux-x64/
+cp build/filtered-resources/runelite.desktop build/linux-x64/
 cp appimage/runelite.png build/linux-x64/
 
 tar zxf linux64_jre.tar.gz

build-osx-aarch64.sh

@@ -5,6 +5,9 @@ set -e
 APPBASE="build/macos-aarch64/RuneLite.app"
 
 build() {
+    echo Launcher sha256sum
+    shasum -a 256 build/libs/RuneLite.jar
+
     pushd native
     cmake -DCMAKE_OSX_ARCHITECTURES=arm64 -B build-aarch64 .
     cmake --build build-aarch64 --config Release
@@ -24,9 +27,9 @@ build() {
     mkdir -p $APPBASE/Contents/{MacOS,Resources}
 
     cp native/build-aarch64/src/RuneLite $APPBASE/Contents/MacOS/
-    cp target/RuneLite.jar $APPBASE/Contents/Resources/
+    cp build/libs/RuneLite.jar $APPBASE/Contents/Resources/
     cp packr/macos-aarch64-config.json $APPBASE/Contents/Resources/config.json
-    cp target/filtered-resources/Info.plist $APPBASE/Contents/
+    cp build/filtered-resources/Info.plist $APPBASE/Contents/
     cp osx/runelite.icns $APPBASE/Contents/Resources/icons.icns
 
     tar zxf mac_aarch64_jre.tar.gz

build-osx-x64.sh

@@ -5,6 +5,9 @@ set -e
 APPBASE="build/macos-x64/RuneLite.app"
 
 build() {
+    echo Launcher sha256sum
+    shasum -a 256 build/libs/RuneLite.jar
+
     pushd native
     cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -B build-x64 .
     cmake --build build-x64 --config Release
@@ -24,9 +27,9 @@ build() {
     mkdir -p $APPBASE/Contents/{MacOS,Resources}
 
     cp native/build-x64/src/RuneLite $APPBASE/Contents/MacOS/
-    cp target/RuneLite.jar $APPBASE/Contents/Resources/
+    cp build/libs/RuneLite.jar $APPBASE/Contents/Resources/
     cp packr/macos-x64-config.json $APPBASE/Contents/Resources/config.json
-    cp target/filtered-resources/Info.plist $APPBASE/Contents/
+    cp build/filtered-resources/Info.plist $APPBASE/Contents/
     cp osx/runelite.icns $APPBASE/Contents/Resources/icons.icns
 
     tar zxf mac64_jre.tar.gz

build-win-aarch64.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+echo Launcher sha256sum
+sha256sum build/libs/RuneLite.jar
+
 cmake -S liblauncher -B liblauncher/buildaarch64 -A ARM64
 cmake --build liblauncher/buildaarch64 --config Release
 
@@ -82,7 +85,7 @@ jlink \
   --add-modules jdk.zipfs
 
 cp native/build-aarch64/src/Release/RuneLite.exe build/win-aarch64/
-cp target/RuneLite.jar build/win-aarch64/
+cp build/libs/RuneLite.jar build/win-aarch64/
 cp packr/win-aarch64-config.json build/win-aarch64/config.json
 cp liblauncher/buildaarch64/Release/launcher_aarch64.dll build/win-aarch64/
 
@@ -92,4 +95,4 @@ sha256sum build/win-aarch64/RuneLite.exe
 dumpbin //HEADERS build/win-aarch64/RuneLite.exe
 
 # We use the filtered iss file
-iscc target/filtered-resources/runeliteaarch64.iss
+iscc build/filtered-resources/runeliteaarch64.iss

build-win32.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+echo Launcher sha256sum
+sha256sum build/libs/RuneLite.jar
+
 cmake -S liblauncher -B liblauncher/build32 -A Win32
 cmake --build liblauncher/build32 --config Release
 
@@ -22,7 +25,7 @@ fi
 echo "$WIN32_CHKSUM win32_jre.zip" | sha256sum -c
 
 cp native/build-x86/src/Release/RuneLite.exe build/win-x86/
-cp target/RuneLite.jar build/win-x86/
+cp build/libs/RuneLite.jar build/win-x86/
 cp packr/win-x86-config.json build/win-x86/config.json
 cp liblauncher/build32/Release/launcher_x86.dll build/win-x86/
 
@@ -35,4 +38,4 @@ sha256sum build/win-x86/RuneLite.exe
 dumpbin //HEADERS build/win-x86/RuneLite.exe
 
 # We use the filtered iss file
-iscc target/filtered-resources/runelite32.iss
+iscc build/filtered-resources/runelite32.iss

build-win64.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+echo Launcher sha256sum
+sha256sum build/libs/RuneLite.jar
+
 cmake -S liblauncher -B liblauncher/build64 -A x64
 cmake --build liblauncher/build64 --config Release
 
@@ -22,7 +25,7 @@ fi
 echo "$WIN64_CHKSUM win64_jre.zip" | sha256sum -c
 
 cp native/build-x64/src/Release/RuneLite.exe build/win-x64/
-cp target/RuneLite.jar build/win-x64/
+cp build/libs/RuneLite.jar build/win-x64/
 cp packr/win-x64-config.json build/win-x64/config.json
 cp liblauncher/build64/Release/launcher_amd64.dll build/win-x64/
 
@@ -35,4 +38,4 @@ sha256sum build/win-x64/RuneLite.exe
 dumpbin //HEADERS build/win-x64/RuneLite.exe
 
 # We use the filtered iss file
-iscc target/filtered-resources/runelite.iss
+iscc build/filtered-resources/runelite.iss