From 50b110f676e323a7896e9b082a37d88b36a2aad0 Mon Sep 17 00:00:00 2001
From: Vitali Olshevski <tech@olshevski.dev>
Date: Wed, 19 Jul 2023 15:37:51 +0300
Subject: [PATCH] Use the new kotlin DSL block in build.gradle.kts

---
 .../main/kotlin/android-application-config.gradle.kts |  8 +++++---
 .../src/main/kotlin/android-library-config.gradle.kts |  7 ++++---
 sample/build.gradle.kts                               | 11 +++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/buildSrc/src/main/kotlin/android-application-config.gradle.kts b/buildSrc/src/main/kotlin/android-application-config.gradle.kts
index 1af4e9fa..101a580e 100644
--- 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)
+    }
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/android-library-config.gradle.kts b/buildSrc/src/main/kotlin/android-library-config.gradle.kts
index 23068b23..d3e4dd70 100644
--- 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)
+    }
 }
\ No newline at end of file
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 82106e2d..955ff8a5 100644
--- 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"
         )
     }
 }