A fully functional Android app built entirely with Kotlin and Jetpack Compose
🚧 AGP 9
Simon Marquisd46b9dc291c0
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex 166b54907..148a1eab6 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -37,7 +37,7 @@ kotlin {}dependencies {- compileOnly(libs.android.gradleApiPlugin)+ compileOnly(libs.android.gradlePlugin)compileOnly(libs.android.tools.common)compileOnly(libs.compose.gradlePlugin)compileOnly(libs.firebase.crashlytics.gradlePlugin)diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex f45d664b7..e952a8f5c 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@ -15,6 +15,7 @@*/import com.android.build.api.dsl.ApplicationExtension+import com.android.build.api.dsl.CommonExtensionimport com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.google.samples.apps.nowinandroid.configureBadgingTasksimport com.google.samples.apps.nowinandroid.configureGradleManagedDevices@@ -30,7 +31,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {override fun apply(target: Project) {with(target) {apply(plugin = "com.android.application")- apply(plugin = "org.jetbrains.kotlin.android")apply(plugin = "nowinandroid.android.lint")apply(plugin = "com.dropbox.dependency-guard")@@ -43,7 +43,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {}extensions.configure<ApplicationAndroidComponentsExtension> {configurePrintApksTask(this)- configureBadgingTasks(extensions.getByType<ApplicationExtension>(), this)+ configureBadgingTasks(extensions.getByType<CommonExtension>(), this)}}}diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.ktindex be3ec0365..c6346f569 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt@@ -28,7 +28,8 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {override fun apply(target: Project) {with(target) {apply(plugin = "com.google.gms.google-services")- apply(plugin = "com.google.firebase.firebase-perf")+ // https://github.com/firebase/firebase-android-sdk/issues/7293+ // apply(plugin = "com.google.firebase.firebase-perf")apply(plugin = "com.google.firebase.crashlytics")dependencies {diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex 0f6fde884..37de193df 100644--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@ -32,12 +32,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {override fun apply(target: Project) {with(target) {apply(plugin = "com.android.library")- apply(plugin = "org.jetbrains.kotlin.android")apply(plugin = "nowinandroid.android.lint")extensions.configure<LibraryExtension> {configureKotlinAndroid(this)- testOptions.targetSdk = 35lint.targetSdk = 35defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"testOptions.animationsDisabled = truediff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.ktindex 49c2eecec..ddfd03e24 100644--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt@@ -26,7 +26,6 @@ class AndroidTestConventionPlugin : Plugin<Project> {override fun apply(target: Project) {with(target) {apply(plugin = "com.android.test")- apply(plugin = "org.jetbrains.kotlin.android")extensions.configure<TestExtension> {configureKotlinAndroid(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 3d050d86b..1daa63d2e 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@@ -28,12 +28,10 @@ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginE* Configure Compose-specific options*/internal fun Project.configureAndroidCompose(- commonExtension: CommonExtension<*, *, *, *, *, *>,+ commonExtension: CommonExtension,) {commonExtension.apply {- buildFeatures {- compose = true- }+ buildFeatures.compose = truedependencies {val bom = libs.findLibrary("androidx-compose-bom").get()diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.ktindex 229388001..ea6f83a83 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt@@ -18,7 +18,7 @@ package com.google.samples.apps.nowinandroidimport com.android.SdkConstantsimport com.android.build.api.artifact.SingleArtifact-import com.android.build.api.dsl.ApplicationExtension+import com.android.build.api.dsl.CommonExtensionimport com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.google.common.truth.Truth.assertWithMessageimport org.gradle.api.DefaultTask@@ -110,7 +110,7 @@ private fun String.capitalized() = replaceFirstChar {}fun Project.configureBadgingTasks(- baseExtension: ApplicationExtension,+ baseExtension: CommonExtension,componentsExtension: ApplicationAndroidComponentsExtension,) {// Registers a callback to be called, when a new variant is configureddiff --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 f67e9093d..9f5cb6637 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 2ac96e556..5c0b2a4b1 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@@ -32,14 +32,12 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension* Configure base Kotlin with Android options*/internal fun Project.configureKotlinAndroid(- commonExtension: CommonExtension<*, *, *, *, *, *>,+ commonExtension: CommonExtension,) {commonExtension.apply {compileSdk = 35- defaultConfig {- minSdk = 23- }+ defaultConfig.minSdk = 23compileOptions {// Up to Java 11 APIs are available through desugaringdiff --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 f57e634cc..9778eb641 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 {@@ -28,15 +28,13 @@ fun configureFlavors(flavorDimensions += flavorDimension.name}- productFlavors {- NiaFlavor.values().forEach { niaFlavor ->- register(niaFlavor.name) {- dimension = niaFlavor.dimension.name- flavorConfigurationBlock(this, niaFlavor)- if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {- if (niaFlavor.applicationIdSuffix != null) {- applicationIdSuffix = niaFlavor.applicationIdSuffix- }+ NiaFlavor.values().forEach { niaFlavor ->+ productFlavors.register(niaFlavor.name) {+ dimension = niaFlavor.dimension.name+ flavorConfigurationBlock(this, niaFlavor)+ if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {+ if (niaFlavor.applicationIdSuffix != null) {+ applicationIdSuffix = niaFlavor.applicationIdSuffix}}}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex bcd784e21..472e15425 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -2,8 +2,8 @@accompanist = "0.37.0"androidDesugarJdkLibs = "2.1.4"# AGP and tools should be updated together-androidGradlePlugin = "8.13.0"-androidTools = "31.13.0"+androidGradlePlugin = "9.0.0-alpha05"+androidTools = "32.0.0-alpha05"androidxActivity = "1.9.3"androidxAppCompat = "1.7.0"androidxBrowser = "1.8.0"@@ -150,7 +150,7 @@ truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }# Dependencies of the included build-logic-android-gradleApiPlugin = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }+android-gradlePlugin = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }