Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🆙 jvmTarget を 17 に変更 #56

Merged
merged 1 commit into from
Nov 23, 2023
Merged

🆙 jvmTarget を 17 に変更 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/club/nito/primitive/AndroidGradleDsl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidApplicationPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class KmpAndroidApplicationPlugin : Plugin<Project> {
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/club/nito/primitive/KmpAndroidPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class KmpAndroidPlugin : Plugin<Project> {
androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/club/nito/primitive/KmpPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down