From 2b17abd825a97b4019851bda193cf7e17a1b4196 Mon Sep 17 00:00:00 2001 From: FuBangkun Date: Tue, 11 Aug 2026 16:14:24 +0800 Subject: [PATCH 1/2] Update GitHub Actions workflows and dependencies, upgrade Gradle version to 9.7.0, and adjust related plugin versions --- .github/workflows/deploy.yml | 24 ++++++++++-------------- README.md | 2 +- build.gradle | 6 +++--- gradle/scripts/dependencies.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 55ea3d00..2a7b465f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: Grant Execute Permission for gradlew run: chmod +x gradlew @@ -29,33 +29,29 @@ jobs: all: true - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: java-version: '25' distribution: 'zulu' - cache: gradle + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@6 - name: Publish to Maven if: steps.properties.outputs.publish_to_maven == 'true' && steps.properties.outputs.publish_to_local_maven == 'true' - uses: gradle/gradle-build-action@v2 - with: - arguments: | - publish - -P${{ steps.properties.outputs.maven_name }}Username=${{ secrets.MAVEN_USER }} + run: | + ./gradlew publish \ + -P${{ steps.properties.outputs.maven_name }}Username=${{ secrets.MAVEN_USER }} \ -P${{ steps.properties.outputs.maven_name }}Password=${{ secrets.MAVEN_PASS }} - name: Publish to CurseForge if: steps.properties.outputs.publish_to_curseforge == 'true' - uses: gradle/gradle-build-action@v2 env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - with: - arguments: curseforge + run: ./gradlew curseforge - name: Publish to Modrinth if: steps.properties.outputs.publish_to_modrinth == 'true' - uses: gradle/gradle-build-action@v2 env: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - with: - arguments: modrinth + run: ./gradlew modrinth diff --git a/README.md b/README.md index 13ba4fbe..688c0340 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ _For Kotlin see [TemplateDevEnvKt](https://github.com/CleanroomMC/TemplateDevEnv Template workspace for modding Minecraft 1.12.2. Licensed under MIT, it is made for public use. -This template runs on **Java 25**, **Gradle 9.6.1** + **[RetroFuturaGradle](https://github.com/GTNewHorizons/RetroFuturaGradle) 2.0.2** + **Forge 14.23.5.2847**. +This template runs on **Java 25**, **Gradle 9.7.0** + **[RetroFuturaGradle](https://github.com/GTNewHorizons/RetroFuturaGradle) 2.0.3** + **Forge 14.23.5.2847**. With **coremod and mixin support** that is easy to configure. diff --git a/build.gradle b/build.gradle index 7280c60c..f9ad7cac 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,11 @@ plugins { id 'java-library' id 'maven-publish' id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1' - id 'com.gtnewhorizons.retrofuturagradle' version '2.0.2' - id 'net.darkhax.curseforgegradle' version '1.2.+' apply false + id 'com.gtnewhorizons.retrofuturagradle' version '2.0.3' + id 'net.darkhax.curseforgegradle' version '1.+' apply false id 'com.modrinth.minotaur' version '2.+' apply false id 'org.jetbrains.changelog' version '2.5.0' - id 'com.gradleup.shadow' version '9.4.+' + id 'com.gradleup.shadow' version '9.6.+' } apply from: 'gradle/scripts/helpers.gradle' diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index fbd777bb..49bcadac 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -40,25 +40,25 @@ dependencies { runtimeOnly 'com.cleanroommc:osxnarratorblocker:1.0' // Example - Dependency descriptor: - // 'com.google.code.gson:gson:2.8.6' << group: com.google.code.gson, name:gson, version:2.8.6 + // 'com.google.code.gson:gson:2.14.0' << group: com.google.code.gson, name:gson, version:2.14.0 // 'group:name:version:classifier' where classifier is optional // Example - Deobfuscating dependencies: - // rfg.deobf('curse.maven:had-enough-items-557549:4543375') + // rfg.deobf('curse.maven:had-enough-items-557549:8605435') // By wrapping a dependency descriptor in rfg.deobf() method call, the dependency is queued for deobfuscation // When deobfuscating, RFG respects the mapping_channel + mapping_version stated in gradle.properties // Example - Shading dependencies: // Using the shadow plugin, by using the "shade" configuration, the dependency will be shaded into your output jar - // shade 'mezz:jei:4.31.2' << will shade HadEnoughItems 4.31.2 directly into your jar + // shade 'mezz:jei:4.33.0' << will shade HadEnoughItems 4.33.0 directly into your jar // For more configuration options: see the bottom of this file and: https://gradleup.com/shadow/configuration/ // Example - CurseMaven dependencies: - // 'curse.maven:had-enough-items-557549:4543375' << had-enough-items = project slug, 557549 = project id, 4543375 = file id + // 'curse.maven:had-enough-items-557549:8605435' << had-enough-items = project slug, 557549 = project id, 8605435 = file id // Full documentation: https://cursemaven.com/ // Example - Modrinth dependencies: - // 'maven.modrinth:jei:4.16.1.1000' << jei = project name, 4.16.1.1000 = file version + // 'maven.modrinth:jei:4.16.5.1026' << jei = project name, 4.16.5.1026 = file version // Full documentation: https://docs.modrinth.com/docs/tutorials/maven/ // Common dependency types (configuration): @@ -72,7 +72,7 @@ dependencies { // (Dependencies that your dependency depends on) // If you wish to exclude transitive dependencies in the described dependencies // Use a closure as such: - // implementation ('com.google.code.gson:gson:2.8.6') { + // implementation ('com.google.code.gson:gson:2.14.0') { // transitive = false // } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0feaf0e6..b894bb62 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 673bd94f81ca21bd3d645560731e7f83075b31d9 Mon Sep 17 00:00:00 2001 From: FuBangkun Date: Tue, 11 Aug 2026 22:46:49 +0800 Subject: [PATCH 2/2] Revert the changes to dependencies.gradle --- gradle/scripts/dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 49bcadac..fbd777bb 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -40,25 +40,25 @@ dependencies { runtimeOnly 'com.cleanroommc:osxnarratorblocker:1.0' // Example - Dependency descriptor: - // 'com.google.code.gson:gson:2.14.0' << group: com.google.code.gson, name:gson, version:2.14.0 + // 'com.google.code.gson:gson:2.8.6' << group: com.google.code.gson, name:gson, version:2.8.6 // 'group:name:version:classifier' where classifier is optional // Example - Deobfuscating dependencies: - // rfg.deobf('curse.maven:had-enough-items-557549:8605435') + // rfg.deobf('curse.maven:had-enough-items-557549:4543375') // By wrapping a dependency descriptor in rfg.deobf() method call, the dependency is queued for deobfuscation // When deobfuscating, RFG respects the mapping_channel + mapping_version stated in gradle.properties // Example - Shading dependencies: // Using the shadow plugin, by using the "shade" configuration, the dependency will be shaded into your output jar - // shade 'mezz:jei:4.33.0' << will shade HadEnoughItems 4.33.0 directly into your jar + // shade 'mezz:jei:4.31.2' << will shade HadEnoughItems 4.31.2 directly into your jar // For more configuration options: see the bottom of this file and: https://gradleup.com/shadow/configuration/ // Example - CurseMaven dependencies: - // 'curse.maven:had-enough-items-557549:8605435' << had-enough-items = project slug, 557549 = project id, 8605435 = file id + // 'curse.maven:had-enough-items-557549:4543375' << had-enough-items = project slug, 557549 = project id, 4543375 = file id // Full documentation: https://cursemaven.com/ // Example - Modrinth dependencies: - // 'maven.modrinth:jei:4.16.5.1026' << jei = project name, 4.16.5.1026 = file version + // 'maven.modrinth:jei:4.16.1.1000' << jei = project name, 4.16.1.1000 = file version // Full documentation: https://docs.modrinth.com/docs/tutorials/maven/ // Common dependency types (configuration): @@ -72,7 +72,7 @@ dependencies { // (Dependencies that your dependency depends on) // If you wish to exclude transitive dependencies in the described dependencies // Use a closure as such: - // implementation ('com.google.code.gson:gson:2.14.0') { + // implementation ('com.google.code.gson:gson:2.8.6') { // transitive = false // } }