Kotlin 2.0 Migration and Fixed Issue With New Compiler Options DSL #160

yshrsmz · Aug 31, 2024 · e9e3e83 · e9e3e83
1 parent 627acda
commit e9e3e83
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/buildkonfig-compiler/build.gradle.kts b/buildkonfig-compiler/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.mavenPublish)
@@ -41,10 +43,10 @@ afterEvaluate {
 }
 
 tasks.compileKotlin {
-    kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
 }
 tasks.compileTestKotlin {
-    kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
 }
 
 apply(from = "$rootDir/gradle/maven-publish.gradle")
diff --git a/buildkonfig-gradle-plugin/build.gradle.kts b/buildkonfig-gradle-plugin/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.mavenPublish)
@@ -52,10 +54,10 @@ dependencies {
 }
 
 tasks.compileKotlin {
-    kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
 }
 tasks.compileTestKotlin {
-    kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) }
 }
 
 apply(from = "$rootDir/gradle/maven-publish.gradle")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,8 @@
 [versions]
 gradle = "8.2.1"
-kotlin = "1.9.22"
+kotlin = "2.0.0"
 dokka = "1.9.20"
 android = "8.1.1"
-jvmTarget = "1.8"
 
 [libraries]
 kotlinpoet = { module = "com.squareup:kotlinpoet", version = "1.17.0" }