diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 3aca68a4..995ec815 100644 --- 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 index 3fcaf3fd..c2707ed7 100644 --- 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 index d2d49492..44f3feb3 100644 --- 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 { 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 index 168cc3ab..5d8bc4ab 100644 --- 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 { 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 index 11503c0f..fefa8278 100644 --- 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 { apply("org.jetbrains.kotlin.multiplatform") } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } tasks.withType().configureEach { notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time")