Gradle: Bump Gradle to 8.1.1 and Kotlin to 1.8.20

build.gradle.kts

@@ -4,8 +4,8 @@ import java.net.URL
 import sciview.*
 
 plugins {
-    val ktVersion = "1.7.20"
-    val dokkaVersion = "1.6.21"
+    val ktVersion = "1.8.20"
+    val dokkaVersion = "1.8.20"
 
     java
     kotlin("jvm") version ktVersion
@@ -26,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    val ktVersion = "1.7.20"
+    val ktVersion = "1.8.20"
     implementation(platform("org.scijava:pom-scijava:31.1.0"))
 
     // Graphics dependencies
@@ -225,6 +225,7 @@ tasks {
                                             "jackson-dataformat-yaml",
                                             "jackson-dataformat-msgpack",
                                             "jogl-all",
+                                            "jna-platform",
                                             "kotlin-bom",
                                             "lwjgl",
                                             "lwjgl-glfw",
@@ -239,7 +240,7 @@ tasks {
 
             val toSkip = listOf("pom-scijava")
 
-            configurations.implementation.allDependencies.forEach {
+            configurations.implementation.get().allDependencies.forEach {
                 val artifactId = it.name
 
                 if (!toSkip.contains(artifactId)) {
@@ -319,7 +320,7 @@ tasks {
     register("runMain", JavaExec::class.java) {
         classpath = sourceSets.main.get().runtimeClasspath
 
-        main = "sc.iview.Main"
+        mainClass.set("sc.iview.Main")
 
         val props = System.getProperties().filter { (k, _) -> k.toString().startsWith("scenery.") }
 
@@ -334,7 +335,7 @@ tasks {
     register("runImageJMain", JavaExec::class.java) {
         classpath = sourceSets.main.get().runtimeClasspath
 
-        main = "sc.iview.ImageJMain"
+        mainClass.set("sc.iview.ImageJMain")
 
         val props = System.getProperties().filter { (k, _) -> k.toString().startsWith("scenery.") }
 
@@ -364,7 +365,7 @@ tasks {
             println("Registering $exampleName of $exampleType")
             register<JavaExec>(name = className.substringAfterLast(".")) {
                 classpath = sourceSets.test.get().runtimeClasspath
-                main = className
+                mainClass.set(className)
                 group = "demos.$exampleType"
 
                 val props = System.getProperties().filter { (k, _) -> k.toString().startsWith("scenery.") }
@@ -391,7 +392,7 @@ tasks {
                 //                    main = target.substringAfter("java${File.separatorChar}").replace(File.separatorChar, '.').substringBefore(".java")
                 //                }
 
-                main = "$target"
+                mainClass.set("$target")
                 val props = System.getProperties().filter { (k, _) -> k.toString().startsWith("scenery.") }
 
                 val additionalArgs = System.getenv("SCENERY_JVM_ARGS")
@@ -401,7 +402,7 @@ tasks {
                     allJvmArgs + props.flatMap { (k, v) -> listOf("-D$k=$v") }
                 }
 
-                println("Will run target $target with classpath $classpath, main=$main")
+                println("Will run target $target with classpath $classpath, main=${mainClass.get()}")
                 println("JVM arguments passed to target: $allJvmArgs")
             }
         }

gradle.properties

@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
 org.gradle.caching=true
+#useLocalScenery=true

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-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