Update dependencies

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       id: setup-jdk
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 21
         distribution: zulu
     - name: build
       run: ./gradlew build

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
         id: setup-jdk
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 21
 
       - name: Create binary keyring
         env:

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 import org.jlleitschuh.gradle.ktlint.KtlintPlugin
@@ -9,8 +11,8 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:10.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+        classpath("org.jlleitschuh.gradle:ktlint-gradle:12.1.0")
         classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
     }
 }
@@ -26,9 +28,9 @@ subprojects {
         version.set("0.45.1")
     }
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+    pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+        configure<KotlinProjectExtension> {
+            jvmToolchain(21)
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,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,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,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 +75,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

vgo-core/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 }
 
 dependencies {
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }

vgo-core/src/test/kotlin/com/jzbrooks/vgo/core/graphic/command/ParserTests.kt

@@ -1,6 +1,7 @@
 package com.jzbrooks.vgo.core.graphic.command
 
 import assertk.all
+import assertk.assertFailure
 import assertk.assertThat
 import assertk.assertions.containsExactly
 import assertk.assertions.containsOnly
@@ -234,8 +235,8 @@ class ParserTests {
     fun testInvalidCommandParsing() {
         val commandString = CommandString("G 3 2")
 
-        assertThat {
+        assertFailure {
             commandString.toCommandList()
-        }.isFailure().hasClass(IllegalStateException::class)
+        }.hasClass(IllegalStateException::class)
     }
 }

vgo-plugin/build.gradle.kts

@@ -2,14 +2,14 @@ plugins {
     id("org.jetbrains.kotlin.jvm")
     id("java-gradle-plugin")
     id("com.vanniktech.maven.publish")
-    id("org.gradle.kotlin.kotlin-dsl") version "2.1.7"
+    id("org.gradle.kotlin.kotlin-dsl") version "4.3.0"
 }
 
 dependencies {
     implementation(project(":vgo"))
 
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }

vgo/build.gradle.kts

@@ -10,17 +10,15 @@ plugins {
 
 sourceSets {
     main {
-        withConvention(KotlinSourceSet::class) {
-            kotlin.srcDir("src/generated/kotlin")
-        }
+        java.srcDirs("src/generated/kotlin")
     }
 }
 
 dependencies {
     implementation(project(":vgo-core"))
 
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
@@ -39,7 +37,7 @@ tasks {
 
         val sourceClasses = sourceSets.main.get().output.classesDirs
         inputs.files(sourceClasses)
-        destinationDirectory.set(file("$buildDir/libs/debug"))
+        destinationDirectory.set(layout.buildDirectory.dir("libs/debug"))
 
         doFirst {
             from(files(sourceClasses))
@@ -68,7 +66,7 @@ tasks {
 
             PrintWriter(generatedFile.toFile()).use { output ->
                 val buildConstantsClass = buildString {
-                    appendln(
+                    appendLine(
                         """
                                |package com.jzbrooks
                                |
@@ -81,25 +79,27 @@ tasks {
 
                     for (property in vgoProperties) {
                         append("    const val ")
-                        append(property.key.toUpperCase())
+                        append(property.key.uppercase())
                         append(" = \"")
                         append(property.value)
-                        appendln('"')
+                        appendLine('"')
                     }
 
-                    appendln("}")
+                    appendLine("}")
                 }
                 output.write(buildConstantsClass)
             }
         }
     }
 
+    val buildDir = layout.buildDirectory
     val optimizedJar = file("$buildDir/libs/vgo.jar")
+
     val optimize by registering(JavaExec::class) {
         description = "Runs proguard on the jar application."
         group = "build"
 
-        inputs.file("$buildDir/libs/debug/vgo-$version.jar")
+        inputs.file(buildDir.dir("libs/debug/vgo-$version.jar"))
         outputs.file(optimizedJar)
 
         val javaHome = System.getProperty("java.home")
@@ -111,7 +111,7 @@ tasks {
             "--lib", javaHome,
             "--output", "$buildDir/libs/vgo.jar",
             "--pg-conf", "$rootDir/optimize.pro",
-            "$buildDir/libs/debug/vgo-$version.jar"
+            "$buildDir/libs/debug/vgo-$version.jar",
         )
 
         dependsOn(getByName("jar"))