chore: update gradle, deps, actions

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Set update schedule for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -10,11 +10,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'adopt'
           java-version: 8
 
       - uses: burrunan/gradle-cache-action@v1

.github/workflows/gradle-wrapper-validation.yml

@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1

build.gradle.kts

@@ -1,8 +1,14 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-	id("com.github.ben-manes.versions") version "0.42.0"
-	id("com.diffplug.spotless") version "6.4.2"
+	id("com.github.ben-manes.versions") version "0.45.0"
+	id("com.diffplug.spotless") version "6.13.0"
+}
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+	google()
 }
 
 fun isNonStable(version: String): Boolean {
@@ -24,12 +30,7 @@ spotless {
 
 		importOrderFile("config/code-formatter/eclipse.importorder")
 		eclipse().configFile("config/code-formatter/eclipse.xml")
-		if (JavaVersion.current() < JavaVersion.VERSION_16) {
-			removeUnusedImports()
-		} else {
-			// google-format broken on java 16+ (https://github.com/diffplug/spotless/issues/834)
-			println("Warning! Unused imports remove is disabled for Java 16+")
-		}
+		removeUnusedImports()
 		encoding("UTF-8")
 		trimTrailingWhitespace()
 		endWithNewline()
@@ -72,10 +73,11 @@ tasks.register("dist", Copy::class) {
 	into(layout.buildDirectory)
 }
 
-tasks.register("clean", Delete::class) {
+tasks.register("cleanBuild", Delete::class) {
 	group = "raung"
 	description = "Remove all build directories"
 
 	delete(layout.buildDirectory)
-	subprojects.forEach { sp -> dependsOn(sp.tasks.named("clean")) }
 }
+
+tasks.getByName("clean").dependsOn("cleanBuild")

buildSrc/src/main/kotlin/raung.java-common.gradle.kts

@@ -18,11 +18,11 @@ repositories {
 
 dependencies {
 
-	testImplementation("ch.qos.logback:logback-classic:1.2.11")
-	testImplementation("org.assertj:assertj-core:3.22.0")
+	testImplementation("ch.qos.logback:logback-classic:1.3.5")
+	testImplementation("org.assertj:assertj-core:3.24.2")
 
-	testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
-	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+	testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
+	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
 }
 
 tasks.test {

buildSrc/src/main/kotlin/raung.java-library.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-	api("org.slf4j:slf4j-api:1.7.36")
+	api("org.slf4j:slf4j-api:2.0.6")
 }
 
 group = "io.github.skylot"

gradle.properties

@@ -1 +1,2 @@
-org.gradle.daemon=false
+org.gradle.warning.mode=all
+org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

raung-asm/build.gradle.kts

@@ -5,5 +5,5 @@ plugins {
 dependencies {
 	api(project(":raung-common"))
 
-	api("org.ow2.asm:asm-util:9.3")
+	api("org.ow2.asm:asm-util:9.4")
 }

raung-cli/build.gradle.kts

@@ -8,8 +8,8 @@ dependencies {
 	implementation(project(":raung-asm"))
 	implementation(project(":raung-disasm"))
 
-	implementation("info.picocli:picocli:4.6.3")
-	implementation("ch.qos.logback:logback-classic:1.2.11")
+	implementation("info.picocli:picocli:4.7.1")
+	implementation("ch.qos.logback:logback-classic:1.3.5")
 }
 
 application {

raung-common/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api("org.ow2.asm:asm:9.3")
+	api("org.ow2.asm:asm:9.4")
 
-	compileOnlyApi("org.jetbrains:annotations:23.0.0")
+	compileOnlyApi("org.jetbrains:annotations:24.0.0")
 }

raung-disasm/src/main/java/io/github/skylot/raung/disasm/impl/utils/JavaVersion.java

@@ -24,7 +24,8 @@ public enum JavaVersion {
 	JAVA_15(59, "15"),
 	JAVA_16(60, "16"),
 	JAVA_17(61, "17"),
-	JAVA_18(62, "18");
+	JAVA_18(62, "18"),
+	JAVA_19(63, "19");
 
 	private final int rawVersion;
 	private final String name;

raung-disasm/src/test/java/io/github/skylot/raung/disasm/impl/utils/TestJavaVersion.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.JAVA_17;
-import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.JAVA_18;
+import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.JAVA_19;
 import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.JAVA_1_1;
 import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.JAVA_8;
 import static io.github.skylot.raung.disasm.impl.utils.JavaVersion.PREVIEW_VERSION;
@@ -17,8 +17,8 @@ public void various() {
 		assertThat(getNameStr(JAVA_1_1.getRawVersion())).isEqualTo("Java 1.1");
 		assertThat(getNameStr(JAVA_8.getRawVersion())).isEqualTo("Java 8");
 		assertThat(getNameStr(JAVA_17.getRawVersion() | PREVIEW_VERSION)).isEqualTo("Java 17 preview");
-		assertThat(getNameStr(JAVA_18.getRawVersion() + 1)).isEqualTo("Java 19 (approximated)");
-		assertThat(getNameStr((JAVA_18.getRawVersion() + 2) | PREVIEW_VERSION)).isEqualTo("Java 20 (approximated) preview");
+		assertThat(getNameStr(JAVA_19.getRawVersion() + 1)).isEqualTo("Java 20 (approximated)");
+		assertThat(getNameStr((JAVA_19.getRawVersion() + 2) | PREVIEW_VERSION)).isEqualTo("Java 21 (approximated) preview");
 
 		assertThat(JAVA_1_1.getMajor()).isEqualTo(45);
 		assertThat(JAVA_1_1.getMinor()).isEqualTo(3);

raung-tests/build.gradle.kts

@@ -6,5 +6,5 @@ dependencies {
 	testImplementation(project(":raung-asm"))
 	testImplementation(project(":raung-disasm"))
 
-	testCompileOnly("org.jetbrains:annotations:23.0.0")
+	testCompileOnly("org.jetbrains:annotations:24.0.0")
 }