🔖 [Hooks]: Align JVM targets to 17

Author: junerver

ai/build.gradle.kts

@@ -14,6 +14,8 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(21)
+
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
             "-Xexpect-actual-classes",
@@ -24,12 +26,17 @@ kotlin {
     androidTarget {
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         publishLibraryVariants("release")
     }
 
-    jvm("desktop")
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
 
     listOf(
         iosX64(),
@@ -112,7 +119,7 @@ android {
         minSdk = 24
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }

app/build.gradle.kts

@@ -13,18 +13,24 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(21)
 
     compilerOptions {
         freeCompilerArgs.add("-Xannotation-default-target=param-property")
     }
     androidTarget {
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 
-    jvm("desktop")
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
 
     applyDefaultHierarchyTemplate()
     sourceSets {
@@ -129,8 +135,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         compose = true

gradle.properties

@@ -47,7 +47,7 @@ mavenCentralAutomaticPublishing=true
 
 GROUP=xyz.junerver.compose
 # use `-SNAPSHOT` can publish a snapshot to maven
-VERSION_NAME=2.2.2-beta-2
+VERSION_NAME=2.2.2-beta-3
 
 POM_NAME=hooks
 

hooks/build.gradle.kts

@@ -14,6 +14,8 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(21)
+
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
             "-Xexpect-actual-classes",
@@ -25,12 +27,17 @@ kotlin {
     androidTarget {
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_1_8)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         publishLibraryVariants("release")
     }
 
-    jvm("desktop")
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
 
     listOf(
         iosX64(),
@@ -112,8 +119,8 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }