feat: upgrade to JVM 21

Smarteon · Nov 15, 2024 · 6174795 · 6174795
1 parent c7175a9
commit 6174795
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Set up Gradle

diff --git a/.github/workflows/loxone-client-release.yml b/.github/workflows/loxone-client-release.yml
@@ -25,10 +25,10 @@ jobs:
           ref: master
           token: ${{ secrets.SMARTEON_GIT_TOKEN }}
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           overwrite-settings: false
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,14 +39,8 @@ detekt {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
-            java {
-                targetCompatibility = JavaVersion.VERSION_11
-            }
-        }
         withJava()
 
         configurations.all {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ kotlin = "1.9.22"
 coroutines = "1.7.1"
 kotest = "5.8.0"
 kotlincrypto = "0.4.0"
-detekt = "1.23.3"
+detekt = "1.23.7"
 ktor = "2.3.7"
 slf4j = "2.0.12"