A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge remote-tracking branch 'origin/main' into graphs
Simon Marquisc94e82849bb0
diff --cc build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.ktindex 9cddabaf6,f45d664b7..4fa7a7afa--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt@@@ -16,10 -16,8 +16,9 @@@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.configureGradleManagedDevices+import com.google.samples.apps.nowinandroid.configureGraphTasksimport com.google.samples.apps.nowinandroid.configureKotlinAndroidimport com.google.samples.apps.nowinandroid.configurePrintApksTaskimport org.gradle.api.Plugin@@@ -45,9 -43,8 +44,9 @@@ class AndroidApplicationConventionPlugi}extensions.configure<ApplicationAndroidComponentsExtension> {configurePrintApksTask(this)- configureBadgingTasks(extensions.getByType<BaseExtension>(), this)+ configureBadgingTasks(extensions.getByType<ApplicationExtension>(), this)}+ configureGraphTasks()}}}diff --cc build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.ktindex 7524678bc,0f6fde884..c4f464101--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt@@@ -14,11 -14,10 +14,11 @@@* 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.configureGradleManagedDevices+import com.google.samples.apps.nowinandroid.configureGraphTasksimport com.google.samples.apps.nowinandroid.configureKotlinAndroidimport com.google.samples.apps.nowinandroid.configurePrintApksTaskimport com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTestsdiff --cc build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.ktindex 933327b2d,49c2eecec..9221cbf08--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt@@@ -14,9 -14,8 +14,9 @@@* limitations under the License.*/- import com.android.build.gradle.TestExtension+ import com.android.build.api.dsl.TestExtensionimport com.google.samples.apps.nowinandroid.configureGradleManagedDevices+import com.google.samples.apps.nowinandroid.configureGraphTasksimport com.google.samples.apps.nowinandroid.configureKotlinAndroidimport org.gradle.api.Pluginimport org.gradle.api.Projectdiff --cc build.gradle.ktsindex c61794f1f,425b2c640..0981b8920--- a/build.gradle.kts+++ b/build.gradle.kts@@@ -58,6 -36,7 +36,6 @@@ pluginsalias(libs.plugins.hilt) apply falsealias(libs.plugins.ksp) apply falsealias(libs.plugins.roborazzi) apply false- alias(libs.plugins.secrets) apply false+ alias(libs.plugins.google.osslicenses) apply falsealias(libs.plugins.room) apply false- alias(libs.plugins.module.graph) apply true // Plugin applied to allow module graph generation}diff --cc gradle/libs.versions.tomlindex b5cd7df15,46c845404..6f75a2aca--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@@ -176,6 -175,8 +174,7 @@@ hilt = { id = "com.google.dagger.hilt.akotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }-module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "moduleGraph" }+ google-osslicenses = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "googleOssPlugin" }protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }room = { id = "androidx.room", version.ref = "room" }