🆙 jvmTarget を 17 に変更

nitoclub · Nov 23, 2023 · 3e12387 · 3e12387
1 parent 585acff
commit 3e12387
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -12,13 +12,13 @@ repositories {
     gradlePluginPortal()
 }
 
-// If we use jvmToolchain, we need to install JDK 11
+// If we use jvmToolchain, we need to install JDK 17
 val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions.jvmTarget = "11"
+compileKotlin.kotlinOptions.jvmTarget = "17"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/AndroidGradleDsl.kt b/build-logic/src/main/kotlin/club/nito/primitive/AndroidGradleDsl.kt
@@ -39,8 +39,8 @@ fun Project.setupAndroid() {
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
             isCoreLibraryDesugaringEnabled = true
         }
         dependencies {

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidApplicationPlugin.kt b/build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidApplicationPlugin.kt
@@ -16,7 +16,7 @@ class KmpAndroidApplicationPlugin : Plugin<Project> {
                 androidTarget {
                     compilations.all {
                         kotlinOptions {
-                            jvmTarget = "11"
+                            jvmTarget = "17"
                         }
                     }
                 }

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidPlugin.kt b/build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidPlugin.kt
@@ -16,7 +16,7 @@ class KmpAndroidPlugin : Plugin<Project> {
                 androidTarget {
                     compilations.all {
                         kotlinOptions {
-                            jvmTarget = "11"
+                            jvmTarget = "17"
                         }
                     }
                 }

diff --git a/build-logic/src/main/kotlin/club/nito/primitive/KmpPlugin.kt b/build-logic/src/main/kotlin/club/nito/primitive/KmpPlugin.kt
@@ -14,7 +14,7 @@ class KmpPlugin : Plugin<Project> {
                 apply("org.jetbrains.kotlin.multiplatform")
             }
             tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
-                kotlinOptions.jvmTarget = "11"
+                kotlinOptions.jvmTarget = "17"
             }
             tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink>().configureEach {
                 notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time")