Update actions

GroovyMC · Jun 16, 2024 · 66fe7cf · 66fe7cf
1 parent 0c8c40f
commit 66fe7cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -20,9 +20,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -34,7 +38,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "uses": "fregante/setup-git-user@v2"
@@ -75,7 +79,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -85,9 +89,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -99,7 +107,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "name": "Publish",

diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,7 @@ managedVersioning {
             workflowDispatch = true
             gradleJob {
                 name = 'build'
+                javaVersion = '21'
                 step {
                     setupGitUser()
                 }
@@ -29,6 +30,7 @@ managedVersioning {
             }
             gradleJob {
                 name.set 'publish'
+                javaVersion = '21'
                 needs.add('build')
                 readOnly = false
                 gradlew 'Publish', 'publish', 'closeAndReleaseSonatypeStagingRepository'