Update Gradle, Gradle plugins, and GitHub actions

NeRdTheNed · NeRdTheNed · commit 60c2a5226123 · 2023-01-14T11:00:10.000+11:00
diff --git a/.github/workflows/draftrelease.yml b/.github/workflows/draftrelease.yml
@@ -12,51 +12,37 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Set up JDK 6
-      id: setup_jdk_6
-      uses: actions/setup-java@v1
+      uses: actions/checkout@v3
+    - name: Set up JDK 6 & 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 6
-    - name: Set up JDK 17
-      id: setup_jdk_17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
+        distribution: 'zulu'
+        java-version: |
+          6
+          17
     - name: Install advancecomp
       run: sudo apt-get install advancecomp
     - name: Install strip-nondeterminism
       run: sudo apt-get install strip-nondeterminism
     - name: Build with Gradle
       env:
-        GITHUB_ACTIONS_JDK_6: ${{ steps.setup_jdk_6.outputs.path }}
-        GITHUB_ACTIONS_JDK_17: ${{ steps.setup_jdk_17.outputs.path }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BUILD_RELEASE: ${{ github.event.release.prerelease == false }}
-      uses: gradle/gradle-build-action@v1
+      uses: gradle/gradle-build-action@v2
       with:
         gradle-version: wrapper
-        distributions-cache-enabled: false
-        dependencies-cache-enabled: false
-        configuration-cache-enabled: false
-        arguments: build publish
+        cache-disabled: true
+        arguments: build publish --scan --stacktrace --warning-mode all
     - name: Run strip-nondeterminism on built .jar files
       run: strip-nondeterminism mc-texture-gen-app/build/libs/*.jar
     - name: Run advzip on built .jar files
       run: advzip --shrink-insane --iter 99999 -k -p -z mc-texture-gen-app/build/libs/*.jar
     - name: Draft release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      uses: softprops/action-gh-release@v1
       with:
         tag_name: ${{ github.ref }}
-        release_name: Draft release ${{ github.ref }}
+        name: Draft release ${{ github.ref }}
         body: Replace this text with the description of this release!
         draft: true
         prerelease: false
-    - name: Upload draft release assets
-      uses: shogo82148/actions-upload-release-asset@v1
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: mc-texture-gen-app/build/libs/*.jar
+        files: mc-texture-gen-app/build/libs/*.jar
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,39 +15,32 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Set up JDK 6
-      id: setup_jdk_6
-      uses: actions/setup-java@v1
+      uses: actions/checkout@v3
+    - name: Set up JDK 6 & 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 6
-    - name: Set up JDK 17
-      id: setup_jdk_17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
+        distribution: 'zulu'
+        java-version: |
+          6
+          17
     - name: Install advancecomp
       run: sudo apt-get install advancecomp
     - name: Install strip-nondeterminism
       run: sudo apt-get install strip-nondeterminism
     - name: Build with Gradle
       env:
-        GITHUB_ACTIONS_JDK_6: ${{ steps.setup_jdk_6.outputs.path }}
-        GITHUB_ACTIONS_JDK_17: ${{ steps.setup_jdk_17.outputs.path }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      uses: gradle/gradle-build-action@v1
+      uses: gradle/gradle-build-action@v2
       with:
         gradle-version: wrapper
-        distributions-cache-enabled: true
-        dependencies-cache-enabled: true
-        configuration-cache-enabled: true
-        arguments: build publish
+        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+        arguments: build publish --scan --stacktrace --warning-mode all
     - name: Run strip-nondeterminism on built .jar files
       run: strip-nondeterminism mc-texture-gen-app/build/libs/*.jar
     - name: Run advzip on built .jar files
       run: advzip --shrink-insane --iter 999 -k -p -z mc-texture-gen-app/build/libs/*.jar
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Package
         path: mc-texture-gen-app/build/libs
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,5 +13,5 @@ dependencies {
     // Shadow is used to package API classes with applications
     implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
     // ProGuard is used to minify and optimise applications
-    implementation "com.guardsquare:proguard-gradle:7.2.2"
+    implementation "com.guardsquare:proguard-gradle:7.3.0"
 }
diff --git a/buildSrc/src/main/groovy/com.github.nerdthened.mctexturegen.java-common-conventions.gradle b/buildSrc/src/main/groovy/com.github.nerdthened.mctexturegen.java-common-conventions.gradle
@@ -9,7 +9,7 @@ repositories {
 // All unit tests use JUnit Jupiter
 dependencies {
     testImplementation group: 'org.junit.jupiter',
-    name: 'junit-jupiter', version: '5.9.1'
+    name: 'junit-jupiter', version: '5.9.2'
 }
 
 // Defines a Java 6 compatible JDK
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,3 @@
-# This property allows Gradle to find a JDK 6 installation when using GitHub actions, because GitHub actions is not smart.
-# TODO: Replace when Gradle supports this natively.
-org.gradle.java.installations.fromEnv=GITHUB_ACTIONS_JDK_6,GITHUB_ACTIONS_JDK_17
-
 # Versions of Java to use when compiling / testing
 
 # Java version to select toolchain used in compiling applications / API classes
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,18 @@
+plugins {
+    id "com.gradle.enterprise" version "3.12.2"
+}
+
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+
+        if (System.getenv("CI")) {
+            publishAlways()
+            tag "CI"
+        }
+    }
+}
+
 rootProject.name = 'mc-texture-gen-base'
 include('mc-texture-gen-app', 'mc-texture-gen-impl')

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`// Shadow is used to package API classes with applications`
`14`	`14`	`implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"`
`15`	`15`	`// ProGuard is used to minify and optimise applications`
`16`		`- implementation "com.guardsquare:proguard-gradle:7.2.2"`
	`16`	`+ implementation "com.guardsquare:proguard-gradle:7.3.0"`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`// All unit tests use JUnit Jupiter`
`10`	`10`	`dependencies {`
`11`	`11`	`testImplementation group: 'org.junit.jupiter',`
`12`		`- name: 'junit-jupiter', version: '5.9.1'`
	`12`	`+ name: 'junit-jupiter', version: '5.9.2'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// Defines a Java 6 compatible JDK`