A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix warnings on changed files
Simon Marquis7af1c8bef9d4
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex 684821bfc..84a18d048 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@ -37,7 +37,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {extensions.configure<ApplicationExtension> {configureKotlinAndroid(this)defaultConfig.targetSdk = 36- @Suppress("UnstableApiUsage")testOptions.animationsDisabled = trueconfigureGradleManagedDevices(this)}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 8aa8a48e8..ca2a6c99b 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@@ -46,6 +46,7 @@ internal fun Project.configureAndroidCompose(extensions.configure<ComposeCompilerGradlePluginExtension> {fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }fun Provider<*>.relativeToRootProject(dir: String) = map {+ @Suppress("UnstableApiUsage")isolated.rootProject.projectDirectory.dir("build").dir(projectDir.toRelativeString(rootDir))@@ -59,6 +60,7 @@ internal fun Project.configureAndroidCompose(.relativeToRootProject("compose-reports").let(reportsDestination::set)+ @Suppress("UnstableApiUsage")stabilityConfigurationFiles.add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf"))}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 310d90d81..992a3f91e 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@@ -36,6 +36,7 @@ internal fun configureGradleManagedDevices(commonExtension.testOptions.apply {+ @Suppress("UnstableApiUsage")managedDevices {allDevices {allDevices.forEach { deviceConfig ->diff --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 9fbf0625c..06a12cde8 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@@ -28,12 +28,12 @@ fun configureFlavors(flavorDimensions += flavorDimension.name}- productFlavors.apply {+ productFlavors.apply flavors@{NiaFlavor.values().forEach { niaFlavor ->register(niaFlavor.name) {dimension = niaFlavor.dimension.nameflavorConfigurationBlock(this, niaFlavor)- if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {+ if (this@flavors is ApplicationExtension && this is ApplicationProductFlavor) {if (niaFlavor.applicationIdSuffix != null) {applicationIdSuffix = niaFlavor.applicationIdSuffix}