A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update new `CommonExtension` signature
Simon Marquis61f7eb8823e7
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.ktindex 9950352b1..7a592e916 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt@@ -27,7 +27,7 @@ import java.io.File* Configure Compose-specific options*/internal fun Project.configureAndroidCompose(- commonExtension: CommonExtension<*, *, *, *>,+ commonExtension: CommonExtension<*, *, *, *, *>,) {commonExtension.apply {buildFeatures {diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.ktindex 86e29be33..6aa896444 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt@@ -25,7 +25,7 @@ import org.gradle.kotlin.dsl.invoke* Configure project for Gradle managed devices*/internal fun configureGradleManagedDevices(- commonExtension: CommonExtension<*, *, *, *>,+ commonExtension: CommonExtension<*, *, *, *, *>,) {val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")diff --git 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.ktindex 8c510c017..04ee4e56e 100644--- 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@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile* Configure base Kotlin with Android options*/internal fun Project.configureKotlinAndroid(- commonExtension: CommonExtension<*, *, *, *>,+ commonExtension: CommonExtension<*, *, *, *, *>,) {commonExtension.apply {compileSdk = 34diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.ktindex ef55024e2..60d059ac0 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt@@ -20,7 +20,7 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St}fun configureFlavors(- commonExtension: CommonExtension<*, *, *, *>,+ commonExtension: CommonExtension<*, *, *, *, *>,flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}) {commonExtension.apply {