Merge pull request #59 from samtkit/java-21

Latest Deps & Java 21
samtkit · Jan 19, 2024 · 58f179d · 58f179d
2 parents fbb3ed0 + f54f95e
commit 58f179d
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/gradle-dependency-submission.yml b/.github/workflows/gradle-dependency-submission.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/qodana-scan.yml b/.github/workflows/qodana-scan.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/security-scanning.yml b/.github/workflows/security-scanning.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,11 +3,11 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {
-    val kotlin = "1.9.10"
+    val kotlin = "1.9.22"
     implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlin")
     implementation("org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:$kotlin")
 }

diff --git a/buildSrc/src/main/kotlin/samt-core.kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/samt-core.kotlin-jvm.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 //apply(plugin = "kover")
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 dependencies {

diff --git a/cli/src/main/kotlin/tools/samt/cli/CliWrapper.kt b/cli/src/main/kotlin/tools/samt/cli/CliWrapper.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import tools.samt.common.DiagnosticController
 import java.io.File
-import java.net.URL
+import java.net.URI
 
 internal fun wrapper(command: WrapperCommand, terminal: Terminal, controller: DiagnosticController) {
     val workingDirectory = File(controller.workingDirectory)
@@ -27,7 +27,7 @@ internal fun wrapper(command: WrapperCommand, terminal: Terminal, controller: Di
                 val targetFile = File(targetDirectory, file)
                 val fileExisted = targetFile.exists()
 
-                URL(fileName).openStream().use { input ->
+                URI(fileName).toURL().openStream().use { input ->
                     targetFile.outputStream().use { output ->
                         input.copyTo(output)
                     }
@@ -64,7 +64,7 @@ internal fun wrapper(command: WrapperCommand, terminal: Terminal, controller: Di
     val newVersion = when (command.version) {
         "latest" -> {
             try {
-                URL(command.latestVersionSource).openStream().use { input ->
+                URI(command.latestVersionSource).toURL().openStream().use { input ->
                     val response = json.decodeFromString<LatestSamtVersionResponse>(input.reader().readText())
                     response.tagName
                 }

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,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,16 +11,16 @@ include(
 
 dependencyResolutionManagement {
     versionCatalogs {
-        val kotlin = "1.9.10"
+        val kotlin = "1.9.22"
         val shadow = "8.1.1"
         val jCommander = "1.82"
-        val mordant = "2.1.0"
-        val kotlinxSerialization = "1.6.0"
-        val kamlVersion = "0.55.0"
-        val kover = "0.7.3"
-        val gitVersioning = "6.4.2"
+        val mordant = "2.2.0"
+        val kotlinxSerialization = "1.6.2"
+        val kamlVersion = "0.56.0"
+        val kover = "0.7.4"
+        val gitVersioning = "6.4.3"
         val lsp4j = "0.21.1"
-        val dokka = "1.8.20"
+        val dokka = "1.9.10"
 
         create("libs") {
             version("kotlin", kotlin)