Use the new kotlin DSL block in build.gradle.kts

olshevski · Jul 19, 2023 · 50b110f · 50b110f
1 parent 59d5225
commit 50b110f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/android-application-config.gradle.kts b/buildSrc/src/main/kotlin/android-application-config.gradle.kts
@@ -1,5 +1,5 @@
+import gradle.kotlin.dsl.accessors._28c5872c54ea2c9cb63ee4324650cf5f.kotlin
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     android
@@ -49,6 +49,8 @@ android {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
 }
diff --git a/buildSrc/src/main/kotlin/android-library-config.gradle.kts b/buildSrc/src/main/kotlin/android-library-config.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `android-library`
@@ -44,6 +43,8 @@ android {
     }
 }
 
-tasks.withType<KotlinCompile> {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
 }
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -5,10 +5,13 @@ plugins {
 
 android {
     namespace = "${project.group}.reimagined.sample"
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi",
-            "-opt-in=dev.olshevski.navigation.reimagined.ExperimentalReimaginedApi"
+}
+
+kotlin {
+    compilerOptions {
+        optIn.addAll(
+            "androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi",
+            "dev.olshevski.navigation.reimagined.ExperimentalReimaginedApi"
         )
     }
 }