Skip to content

Commit b1b39a8

Browse files
chore(deps): Update dependency Kotlin to v2 (#740)
* chore(deps): Update dependency org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin to v2 * Update kotlin build conventions --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
1 parent cceb905 commit b1b39a8

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

gradle/build-logic/src/main/kotlin/CloudKotlinConventions.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.kotlin
88
import org.gradle.kotlin.dsl.named
99
import org.gradle.kotlin.dsl.withType
1010
import org.jetbrains.dokka.gradle.DokkaTask
11+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1112
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
1213

1314
class CloudKotlinConventions : Plugin<Project> {
@@ -24,13 +25,8 @@ class CloudKotlinConventions : Plugin<Project> {
2425
languageVersion.set(JavaLanguageVersion.of(8))
2526
}
2627
coreLibrariesVersion = libs.versions.kotlin.get()
27-
target {
28-
compilations.configureEach {
29-
kotlinOptions {
30-
jvmTarget = "1.8"
31-
languageVersion = libs.versions.kotlin.get().split(".").take(2).joinToString(".")
32-
}
33-
}
28+
compilerOptions {
29+
jvmTarget.set(JvmTarget.JVM_1_8)
3430
}
3531
}
3632

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ immutables = "2.10.1"
1818
guice = "7.0.0"
1919

2020
# kotlin
21-
kotlin = "1.9.24"
21+
kotlin = "2.0.0"
2222
dokka = "1.9.20"
2323
coroutines = "1.8.0"
2424
ktlint = "0.50.0"

0 commit comments

Comments
 (0)