Upgrade to Java 21 and Gradle 8.4 (#107)

.github/workflows/build.yml

@@ -19,11 +19,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Setup Java 19
+      - name: Setup Java 21
         uses: actions/setup-java@v3
         with:
           distribution: corretto
-          java-version: 19
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -46,11 +46,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Setup Java 19
+      - name: Setup Java 21
         uses: actions/setup-java@v3
         with:
           distribution: corretto
-          java-version: 19
+          java-version: 21
 
       - name: Setup HandBrake (Linux)
         if: matrix.os == 'ubuntu-latest'
@@ -99,11 +99,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java 19
+      - name: Setup Java 21
         uses: actions/setup-java@v3
         with:
           distribution: corretto
-          java-version: 19
+          java-version: 21
 
       - name: Bump version
         id: version

auto-handbrake-cfr/build.gradle.kts

@@ -2,8 +2,8 @@ import org.ajoberstar.grgit.Grgit
 import org.unbrokendome.gradle.plugins.testsets.dsl.testSets
 
 plugins {
-  id("org.unbroken-dome.test-sets") version "4.0.0"
-  id("com.google.cloud.tools.jib") version "3.3.2"
+  id("org.unbroken-dome.test-sets") version "4.1.0"
+  id("com.google.cloud.tools.jib") version "3.4.0"
   id("org.ajoberstar.grgit") version "5.2.0"
 }
 
@@ -22,7 +22,6 @@ jib {
     mainClass = "com.willmolloy.handbrake.cfr.Main"
     args = listOf("/input", "/output", "/archive")
     creationTime.set(gitCommitTime())
-    jvmFlags = listOf("--enable-preview")
   }
 }
 

base.Dockerfile

@@ -1,6 +1,6 @@
 # base HandBrake + Java image
 
-FROM amazoncorretto:19-alpine3.14
+FROM amazoncorretto:21-alpine3.15
 
 # Compile HandBrake
 # credit: https://github.com/txstate-etc/mediaflo-encoder/blob/77bda38311f97903bd11d4fe10a0c516e8d8d145/worker/Dockerfile

build.gradle.kts

@@ -11,8 +11,8 @@ logger.quiet("Gradle version: ${gradle.gradleVersion}")
 
 plugins {
   id("java-library")
-  id("com.diffplug.gradle.spotless") version "6.19.0" apply (false)
-  id("com.github.spotbugs") version "5.0.14" apply (false)
+  id("com.diffplug.gradle.spotless") version "6.22.0" apply (false)
+  id("com.github.spotbugs") version "5.1.5" apply (false)
   id("com.asarkar.gradle.build-time-tracker") version "4.3.0"
 }
 
@@ -26,8 +26,8 @@ allprojects {
 subprojects {
   apply(plugin = "java")
   configure<JavaPluginExtension> {
-    sourceCompatibility = JavaVersion.VERSION_19
-    targetCompatibility = JavaVersion.VERSION_19
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
   }
 
   apply(plugin = "com.diffplug.spotless")
@@ -89,17 +89,6 @@ subprojects {
     }
   }
 
-  val previewFeatures = listOf("--enable-preview")
-  tasks.withType<JavaCompile> {
-    options.compilerArgs = previewFeatures
-  }
-  tasks.withType<Test> {
-    jvmArgs = previewFeatures
-  }
-  tasks.withType<JavaExec> {
-    jvmArgs = previewFeatures
-  }
-
   dependencies {
     val log4jVersion = "2.20.0"
     val guavaVersion = "32.0.1-jre"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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 
+        # shellcheck disable=SC2039,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 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

spotbugs-exclude.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FindBugsFilter>
-
-  <!-- False positive with records -->
   <Match>
-    <Bug pattern="EQ_UNUSUAL" />
+    <Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
   </Match>
-
 </FindBugsFilter>