Merge branch 'refs/heads/compose-1.7'

# Conflicts: # compose-destinations-bottom-sheet/build.gradle.kts # compose-destinations-wear/build.gradle.kts # compose-destinations/build.gradle.kts # compose-destinations/src/main/java/com/ramcosta/composedestinations/DefaultNavHostEngine.kt # compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/DestinationSpec.kt # compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/NavGraphSpec.kt # compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/Route.kt # gradle/libs.versions.toml # playground/app/build.gradle.kts # sample/build.gradle.kts
anyopensource · Jul 20, 2024 · 0c873f4 · 0c873f4
2 parents 8d577d5 + 21bcefc
commit 0c873f4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 37 deletions.
diff --git a/compose-destinations-bottom-sheet/build.gradle.kts b/compose-destinations-bottom-sheet/build.gradle.kts
@@ -13,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toIntOrNull()
-        targetSdk = libs.versions.targetSdk.get().toIntOrNull()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles.add(File("consumer-rules.pro"))
@@ -40,11 +39,13 @@ android {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-opt-in=kotlin.RequiresOptIn",
-        "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
-    )
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll(
+            "-opt-in=kotlin.RequiresOptIn",
+            "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
+        )
+    }
 }
 
 dependencies {

diff --git a/compose-destinations-ksp/build.gradle.kts b/compose-destinations-ksp/build.gradle.kts
@@ -9,12 +9,12 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
     }
+
+    jvmToolchain(8)
 }
 
 dependencies {

diff --git a/compose-destinations-wear/build.gradle.kts b/compose-destinations-wear/build.gradle.kts
@@ -13,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = 25
-        targetSdk = libs.versions.targetSdk.get().toIntOrNull()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles.add(File("consumer-rules.pro"))
@@ -38,17 +37,17 @@ android {
     buildFeatures {
         compose = true
     }
+
 }
 
 kotlin {
     jvmToolchain(11)
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-opt-in=kotlin.RequiresOptIn",
-        "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
-    )
+    compilerOptions {
+        freeCompilerArgs.addAll(
+            "-opt-in=kotlin.RequiresOptIn",
+            "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
+        )
+    }
 }
 
 dependencies {

diff --git a/compose-destinations/build.gradle.kts b/compose-destinations/build.gradle.kts
@@ -44,11 +44,13 @@ android {
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-opt-in=kotlin.RequiresOptIn",
-        "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
-    )
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll(
+            "-opt-in=kotlin.RequiresOptIn",
+            "-opt-in=com.ramcosta.composedestinations.annotation.internal.InternalDestinationsApi"
+        )
+    }
 }
 
 dependencies {

diff --git a/playground/app/build.gradle.kts b/playground/app/build.gradle.kts
@@ -7,10 +7,6 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-}
-
 android {
     namespace = "com.ramcosta.samples.playground"
     compileSdk = libs.versions.compileSdk.get().toIntOrNull()
@@ -71,6 +67,9 @@ android {
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/sample-wear/build.gradle.kts b/sample-wear/build.gradle.kts
@@ -1,12 +1,8 @@
 plugins {
     id("com.android.application")
     kotlin("android")
-    alias(libs.plugins.compose.compiler)
     id("com.google.devtools.ksp") version libs.versions.ksp.get()
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -53,6 +49,9 @@ android {
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-}
-
 android {
     namespace = "com.ramcosta.destinations.sample"
     compileSdk = libs.versions.compileSdk.get().toIntOrNull()
@@ -53,6 +49,9 @@ android {
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {