A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge branch 'main' into jvmToolchain
Simon Marquisddabba8e4a82
diff --cc build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex e0efe511b,26b6951d3..0e2eaa397--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@@ -14,12 -14,10 +14,11 @@@* limitations under the License.*/- import com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.android.build.api.dsl.ApplicationExtension- import com.google.samples.apps.nowinandroid.configureFlavorsimport com.google.samples.apps.nowinandroid.configureGradleManagedDevices+ import com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.google.samples.apps.nowinandroid.configureKotlinAndroid+import com.google.samples.apps.nowinandroid.configureKotlinAndroidToolchainimport com.google.samples.apps.nowinandroid.configurePrintApksTaskimport org.gradle.api.Pluginimport org.gradle.api.Projectdiff --cc build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex c0e269243,275a26620..2ffeae974--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@@ -20,8 -19,8 +19,9 @@@ import com.android.build.gradle.Libraryimport com.google.samples.apps.nowinandroid.configureFlavorsimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroid+import com.google.samples.apps.nowinandroid.configureKotlinAndroidToolchainimport com.google.samples.apps.nowinandroid.configurePrintApksTask+ import com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTestsimport org.gradle.api.Pluginimport org.gradle.api.Projectimport org.gradle.api.artifacts.VersionCatalogsExtensiondiff --cc build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex 2b5d1c354,65a734895..656a66329--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@@ -25,8 -23,8 +25,10 @@@ import org.gradle.kotlin.dsl.configurimport org.gradle.kotlin.dsl.dependenciesimport org.gradle.kotlin.dsl.getByTypeimport org.gradle.kotlin.dsl.provideDelegate+ import org.gradle.kotlin.dsl.withType+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile/*** Configure base Kotlin with Android options