Updated build script

.github/workflows/build-release.yml

@@ -7,29 +7,9 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 30 # Gets the last 30 commits so the changelog might work
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Build & release to curseforge
-        env:
-          GIT_COMMIT: ${{ github.event.after }}
-          GIT_PREVIOUS_COMMIT: ${{ github.event.before }}
-          NANITE_DEPLOY : ${{ secrets.NANITE_DEPLOY  }}
-          CURSE_DEPLOY: ${{ secrets.CURSE_DEPLOY }}
-        run: |
-          chmod +x ./gradlew
-          ./gradlew build publish curseforge --stacktrace --no-daemon
+    if: |
+      !contains(github.event.head_commit.message, '[ciskip]')
+    uses: nanite/workflows/.github/workflows/standard-arch-release.yml@v1
+    secrets:
+      nanite-token: ${{ secrets.NANITE_DEPLOY }}
+      curse-token: ${{ secrets.CURSE_DEPLOY }}

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.3]
+
+- Update build script
+- Added cloth config as required dep
+
 ## [2.0.1]
 
 - Forge/Fabric bump

build.gradle

@@ -45,3 +45,5 @@ allprojects {
         withSourcesJar()
     }
 }
+
+task curseforgePublish

common/build.gradle

@@ -27,12 +27,12 @@ publishing {
     }
 
     repositories {
-        if (ENV.NANITE_DEPLOY) {
+        if (ENV.NANITE_TOKEN) {
             maven {
                 url "https://maven.nanite.dev/releases"
                 credentials {
                     username = "nanite"
-                    password = "${ENV.NANITE_DEPLOY}"
+                    password = "${ENV.NANITE_TOKEN}"
                 }
             }
         }

fabric/build.gradle

@@ -85,21 +85,21 @@ publishing {
     }
 
     repositories {
-        if (ENV.NANITE_DEPLOY) {
+        if (ENV.NANITE_TOKEN) {
             maven {
                 url "https://maven.nanite.dev/releases"
                 credentials {
                     username = "nanite"
-                    password = "${ENV.NANITE_DEPLOY}"
+                    password = "${ENV.NANITE_TOKEN}"
                 }
             }
         }
     }
 }
 
-if (ENV.CURSE_DEPLOY) {
+if (ENV.CURSE_TOKEN) {
     curseforge {
-        apiKey = ENV.CURSE_DEPLOY
+        apiKey = ENV.CURSE_TOKEN
         project {
             id = project.curseforge_id
             releaseType = "release"
@@ -109,10 +109,13 @@ if (ENV.CURSE_DEPLOY) {
             relations {
                 requiredDependency 'fabric-api'
                 requiredDependency 'architectury-api'
+                requiredDependency 'cloth-config'
             }
             mainArtifact(remapJar.archivePath)
             changelog = file("../CHANGELOG.md")
             changelogType = 'markdown'
         }
     }
 }
+
+rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")

forge/build.gradle

@@ -90,12 +90,12 @@ publishing {
 
     // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        if (ENV.NANITE_DEPLOY) {
+        if (ENV.NANITE_TOKEN) {
             maven {
                 url "https://maven.nanite.dev/releases"
                 credentials {
                     username = "nanite"
-                    password = "${ENV.NANITE_DEPLOY}"
+                    password = "${ENV.NANITE_TOKEN}"
                 }
             }
         }
@@ -113,10 +113,13 @@ if (ENV.CURSE_DEPLOY) {
             addGameVersion "${minecraft_version}"
             relations {
                 requiredDependency 'architectury-api'
+                requiredDependency 'cloth-config'
             }
             mainArtifact(remapJar)
             changelog = file("../CHANGELOG.md")
             changelogType = 'markdown'
         }
     }
 }
+
+rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.18.2
 enabled_platforms=fabric,forge
 
 archives_base_name=squatgrow
-mod_version=2.0.2
+mod_version=2.0.3
 maven_group=dev.wuffs
 
 architectury_version=4.9.83

settings.gradle

@@ -11,4 +11,4 @@ include("common")
 include("fabric")
 include("forge")
 
-rootProject.name = "architectury-example-mod"
+rootProject.name = "SquatGrow"