Switch to FG6 fork which supports Gradle 9

.github/workflows/BuildTest.yml

@@ -39,26 +39,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.0
         with:
           fetch-tags: true
           fetch-depth: 0
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@v5.0.0
         with:
           java-version: '21'
           distribution: 'temurin'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
       - name: Get branch name
         id: branch-names
-        uses: tj-actions/branch-names@v9
+        uses: tj-actions/branch-names@v9.0.2
 
       - name: Fix Gradle permission
         run: chmod +x ./gradlew
 
       - name: Setup Forge env
-        run: ./gradlew setup -Prun_number=${{ github.run_number }}
+        run: ./gradlew setup -Prun_number=${{ github.run_number }} --info --stacktrace
+
       - name: Stop Gradle daemon
         run: ./gradlew --stop
 
@@ -69,7 +73,7 @@ jobs:
         run: echo "CLEANROOM_VERSION=$(cat version.txt)" >> $GITHUB_ENV
 
       - name: setup python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: '3.13'
 
@@ -85,19 +89,19 @@ jobs:
         run: cp script/MMC-Builder/build/CleanroomMMC.zip ./projects/cleanroom/build/libs/Cleanroom-MMC-instance-${{ env.CLEANROOM_VERSION }}.zip
 
       - name: Upload Universal Jar
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5.0.0
         with:
           name: universal-jar-${{ env.CLEANROOM_VERSION }}
           path: projects/cleanroom/build/libs/*-universal.jar
 
       - name: Upload Installer Jar
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5.0.0
         with:
           name: installer-jar-${{ env.CLEANROOM_VERSION }}
           path: projects/cleanroom/build/libs/*-installer.jar
 
       - name: Upload MMC pack zip
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5.0.0
         with:
           name: mmc-pack-zip-${{ env.CLEANROOM_VERSION }}
           path: projects/cleanroom/build/libs/*.zip

.github/workflows/Publish.yml

@@ -10,16 +10,19 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.0
         with:
           fetch-tags: true
           fetch-depth: 0
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@v5.0.0
         with:
           java-version: '21'
           distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Fix Gradle permission
         run: chmod +x ./gradlew

.github/workflows/Release.yml

@@ -12,16 +12,19 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v6.0.0
         with:
           fetch-tags: true
           fetch-depth: 0
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@v5.0.0
         with:
           java-version: '21'
           distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Fix Gradle permission
         run: chmod +x ./gradlew
@@ -42,7 +45,7 @@ jobs:
         run: ./gradlew --stop
 
       - name: setup python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: '3.13'
 
@@ -65,7 +68,7 @@ jobs:
           rm projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-userdev.jar
           rm projects/cleanroom/build/libs/cleanroom-${{ env.CLEANROOM_VERSION }}-userdev-temp.jar
 
-      - uses: ncipollo/release-action@v1.14.0
+      - uses: ncipollo/release-action@v1.20.0
         with:
           artifacts: "projects/cleanroom/build/libs/*"
           generateReleaseNotes: true

build.gradle

@@ -1,18 +1,17 @@
 buildscript {
     repositories {
         mavenLocal()
-        mavenCentral()
-        maven {
-            name "MinecraftForge"
-            url "https://maven.minecraftforge.net/"
-        }
         maven {
-            name "Outlands"
-            url "https://maven.outlands.top/releases/"
+            name = "Outlands"
+            url = 'https://maven.outlands.top/releases/'
         }
+        mavenCentral()
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:6.0.+"
+        classpath 'top.outlands.gradle:ForgeGradle:6.0.+'
+        classpath('top.outlands:artifactural:3.0.1') {
+            transitive = false
+        }
     }
 }
 

buildSrc/build.gradle

@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:9.8'
-    implementation 'org.ow2.asm:asm-tree:9.8'
+    implementation 'org.ow2.asm:asm:9.9'
+    implementation 'org.ow2.asm:asm-tree:9.9'
 }

buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/Util.groovy

@@ -197,9 +197,9 @@ class Util {
 		new Date().iso8601()
 	}
 
-	static def sha1(file) {
+	static def sha1(File file) {
 		MessageDigest md = MessageDigest.getInstance('SHA-1')
-		file.eachByte 4096, { bytes, size ->
+		file.eachByte 4096, {byte[] bytes, int size ->
 			md.update(bytes, 0, size)
 		}
 		return md.digest().collect {String.format "%02x", it}.join()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists