A fully functional Android app built entirely with Kotlin and Jetpack Compose
Replace gradle to gradle-api. Should use `gradle-api`. https://developer.android.com/build/releases/gradle-plugin-roadmap#agp-10
Jaehwa Noh17100a4119ae
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex 6d0237010..958ae82f5 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -37,7 +37,7 @@ kotlin {}dependencies {- compileOnly(libs.android.gradlePlugin)+ compileOnly(libs.android.gradleApiPlugin)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 1ab3a2ca0..f45d664b7 100644--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@ -16,7 +16,6 @@import com.android.build.api.dsl.ApplicationExtensionimport com.android.build.api.variant.ApplicationAndroidComponentsExtension-import com.android.build.gradle.BaseExtensionimport com.google.samples.apps.nowinandroid.configureBadgingTasksimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroid@@ -44,7 +43,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {}extensions.configure<ApplicationAndroidComponentsExtension> {configurePrintApksTask(this)- configureBadgingTasks(extensions.getByType<BaseExtension>(), this)+ configureBadgingTasks(extensions.getByType<ApplicationExtension>(), this)}}}diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.ktindex 1af5523c5..343bd4859 100644--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt@@ -14,7 +14,7 @@* limitations under the License.*/-import com.android.build.gradle.LibraryExtension+import com.android.build.api.dsl.LibraryExtensionimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.libsimport org.gradle.api.Plugindiff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.ktindex 19fabf549..63a992b05 100644--- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt@@ -14,7 +14,7 @@* limitations under the License.*/-import com.android.build.gradle.LibraryExtension+import com.android.build.api.dsl.LibraryExtensionimport com.google.samples.apps.nowinandroid.configureAndroidComposeimport org.gradle.api.Pluginimport org.gradle.api.Projectdiff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex 3fe727410..0f6fde884 100644--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@ -14,8 +14,8 @@* limitations under the License.*/+import com.android.build.api.dsl.LibraryExtensionimport com.android.build.api.variant.LibraryAndroidComponentsExtension-import com.android.build.gradle.LibraryExtensionimport com.google.samples.apps.nowinandroid.configureFlavorsimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroid@@ -37,7 +37,8 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {extensions.configure<LibraryExtension> {configureKotlinAndroid(this)- defaultConfig.targetSdk = 35+ testOptions.targetSdk = 35+ lint.targetSdk = 35defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"testOptions.animationsDisabled = trueconfigureFlavors(this)diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.ktindex 67933f77d..49c2eecec 100644--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt@@ -14,7 +14,7 @@* limitations under the License.*/-import com.android.build.gradle.TestExtension+import com.android.build.api.dsl.TestExtensionimport com.google.samples.apps.nowinandroid.configureGradleManagedDevicesimport com.google.samples.apps.nowinandroid.configureKotlinAndroidimport org.gradle.api.Plugindiff --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 886c70625..229388001 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,8 +18,8 @@ package com.google.samples.apps.nowinandroidimport com.android.SdkConstantsimport com.android.build.api.artifact.SingleArtifact+import com.android.build.api.dsl.ApplicationExtensionimport com.android.build.api.variant.ApplicationAndroidComponentsExtension-import com.android.build.gradle.BaseExtensionimport com.google.common.truth.Truth.assertWithMessageimport org.gradle.api.DefaultTaskimport org.gradle.api.Project@@ -110,7 +110,7 @@ private fun String.capitalized() = replaceFirstChar {}fun Project.configureBadgingTasks(- baseExtension: BaseExtension,+ baseExtension: ApplicationExtension,componentsExtension: ApplicationAndroidComponentsExtension,) {// Registers a callback to be called, when a new variant is configureddiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 81f12c480..dc459d651 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -153,7 +153,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-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }+android-gradleApiPlugin = { 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" }