A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge remote-tracking branch 'origin/main' into agp-9
Simon Marquis269f44584889
diff --cc build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex 17c4379e7,a3f6e0a2e..ee47e823a--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@@ -36,7 -37,9 +36,8 @@@ class AndroidLibraryConventionPlugin :extensions.configure<LibraryExtension> {configureKotlinAndroid(this)- lint.targetSdk = 35+ testOptions.targetSdk = 36+ lint.targetSdk = 36- defaultConfig.targetSdk = 36defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"testOptions.animationsDisabled = trueconfigureFlavors(this)diff --cc build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex a923ce24e,81f26e9db..37b1ba99b--- 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@@@ -32,12 -32,12 +32,12 @@@ import org.jetbrains.kotlin.gradle.dsl.* Configure base Kotlin with Android options*/internal fun Project.configureKotlinAndroid(- commonExtension: CommonExtension<*, *, *, *, *, *>,+ commonExtension: CommonExtension,) {commonExtension.apply {- compileSdk = 35+ compileSdk = 36- defaultConfig {+ defaultConfig.apply {minSdk = 23}