Cleanup Gradle dependencies and miscellaneous improvements

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -107,6 +107,7 @@ com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
 com.squareup.okio:okio:3.9.0
 io.coil-kt:coil-base:2.7.0
+io.coil-kt:coil-bom:2.7.0
 io.coil-kt:coil-compose-base:2.7.0
 io.coil-kt:coil-compose:2.7.0
 io.coil-kt:coil:2.7.0

app/build.gradle.kts

@@ -94,14 +94,17 @@ dependencies {
     implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
     implementation(libs.androidx.tracing.ktx)
     implementation(libs.androidx.window.core)
+    implementation(libs.hilt.ext.navigation.compose)
+    implementation(platform(libs.kotlinx.coroutines.bom))
     implementation(libs.kotlinx.coroutines.guava)
+    implementation(platform(libs.coil.kt.bom))
     implementation(libs.coil.kt)
+    implementation(platform(libs.kotlinx.serialization.bom))
     implementation(libs.kotlinx.serialization.json)
 
     ksp(libs.hilt.compiler)

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -193,25 +193,28 @@ com.google.firebase:firebase-messaging:24.1.0
 com.google.firebase:firebase-perf:21.0.3
 com.google.firebase:firebase-sessions:2.0.7
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:31.1-android
+com.google.guava:guava:32.0.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.3
+com.google.j2objc:j2objc-annotations:2.8
 com.google.protobuf:protobuf-javalite:4.29.2
 com.google.protobuf:protobuf-kotlin-lite:4.29.2
 com.squareup.okhttp3:logging-interceptor:4.12.0
+com.squareup.okhttp3:okhttp-bom:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0
 com.squareup.okio:okio:3.9.0
 com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0
+com.squareup.retrofit2:retrofit-bom:2.11.0
 com.squareup.retrofit2:retrofit:2.11.0
 io.coil-kt:coil-base:2.7.0
+io.coil-kt:coil-bom:2.7.0
 io.coil-kt:coil-compose-base:2.7.0
 io.coil-kt:coil-compose:2.7.0
 io.coil-kt:coil-svg:2.7.0
 io.coil-kt:coil:2.7.0
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-org.checkerframework:checker-qual:3.12.0
+org.checkerframework:checker-qual:3.33.0
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
 org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10

build-logic/convention/build.gradle.kts

@@ -37,18 +37,27 @@ kotlin {
 }
 
 dependencies {
-    compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.android.tools.common)
-    compileOnly(libs.compose.gradlePlugin)
-    compileOnly(libs.firebase.crashlytics.gradlePlugin)
-    compileOnly(libs.firebase.performance.gradlePlugin)
-    compileOnly(libs.kotlin.gradlePlugin)
-    compileOnly(libs.ksp.gradlePlugin)
-    compileOnly(libs.room.gradlePlugin)
+    compileOnly(plugin(libs.plugins.android.application))
+    compileOnly(plugin(libs.plugins.android.library))
+    compileOnly(plugin(libs.plugins.compose))
+    compileOnly(plugin(libs.plugins.firebase.crashlytics))
+    compileOnly(plugin(libs.plugins.firebase.perf))
+    compileOnly(plugin(libs.plugins.ksp))
+    compileOnly(plugin(libs.plugins.room))
     implementation(libs.truth)
     lintChecks(libs.androidx.lint.gradle)
 }
 
+/**
+ * Converts Gradle Plugin alias from a Version Catalog into a valid dependency notation for this included build script.
+ * See https://github.com/gradle/gradle/issues/17963.
+ */
+@Suppress("UnusedReceiverParameter")
+private fun DependencyHandlerScope.plugin(plugin: Provider<PluginDependency>) = plugin.map {
+    "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version.requiredVersion}"
+}
+
 tasks {
     validatePlugins {
         enableStricterValidation = true

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -39,11 +39,12 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 "implementation"(project(":core:ui"))
                 "implementation"(project(":core:designsystem"))
 
-                "implementation"(libs.findLibrary("androidx.hilt.navigation.compose").get())
                 "implementation"(libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
                 "implementation"(libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
                 "implementation"(libs.findLibrary("androidx.navigation.compose").get())
                 "implementation"(libs.findLibrary("androidx.tracing.ktx").get())
+                "implementation"(libs.findLibrary("hilt.ext.navigation.compose").get())
+                "implementation"(platform(libs.findLibrary("kotlinx.serialization.bom").get()))
                 "implementation"(libs.findLibrary("kotlinx.serialization.json").get())
 
                 "testImplementation"(libs.findLibrary("androidx.navigation.testing").get())

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt

@@ -62,7 +62,7 @@ internal fun Project.configureJacoco(
     androidComponentsExtension: AndroidComponentsExtension<*, *, *>,
 ) {
     configure<JacocoPluginExtension> {
-        toolVersion = libs.findVersion("jacoco").get().toString()
+        toolVersion = libs.findLibrary("jacoco").get().get().version.toString()
     }
 
     androidComponentsExtension.onVariants { variant ->

core/common/build.gradle.kts

@@ -19,6 +19,7 @@ plugins {
 }
 
 dependencies {
+    implementation(platform(libs.kotlinx.coroutines.bom))
     implementation(libs.kotlinx.coroutines.core)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.turbine)

core/data/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
     implementation(projects.core.notifications)
 
     testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(platform(libs.kotlinx.serialization.bom))
     testImplementation(libs.kotlinx.serialization.json)
     testImplementation(projects.core.datastoreTest)
     testImplementation(projects.core.testing)

core/datastore-proto/build.gradle.kts

@@ -26,7 +26,8 @@ android {
 // Setup protobuf configuration, generating lite Java and Kotlin classes
 protobuf {
     protoc {
-        artifact = libs.protobuf.protoc.get().toString()
+        // protobuf gradle plugin does not follow BoM configuration
+        artifact = "${libs.protobuf.protoc.get()}:${libs.protobuf.bom.get().version}"
     }
     generateProtoTasks {
         all().forEach { task ->
@@ -51,5 +52,6 @@ androidComponents.beforeVariants {
 }
 
 dependencies {
+    api(platform(libs.protobuf.bom))
     api(libs.protobuf.kotlin.lite)
 }

core/designsystem/build.gradle.kts

@@ -36,6 +36,7 @@ dependencies {
     api(libs.androidx.compose.runtime)
     api(libs.androidx.compose.ui.util)
 
+    implementation(platform(libs.coil.kt.bom))
     implementation(libs.coil.kt.compose)
 
     testImplementation(libs.androidx.compose.ui.test)

core/network/build.gradle.kts

@@ -43,10 +43,14 @@ dependencies {
     api(projects.core.common)
     api(projects.core.model)
 
+    implementation(platform(libs.coil.kt.bom))
     implementation(libs.coil.kt)
     implementation(libs.coil.kt.svg)
+    implementation(platform(libs.kotlinx.serialization.bom))
     implementation(libs.kotlinx.serialization.json)
+    implementation(platform(libs.okhttp.bom))
     implementation(libs.okhttp.logging)
+    implementation(platform(libs.retrofit.bom))
     implementation(libs.retrofit.core)
     implementation(libs.retrofit.kotlin.serialization)
 

core/ui/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
     api(projects.core.model)
 
     implementation(libs.androidx.browser)
+    implementation(platform(libs.coil.kt.bom))
     implementation(libs.coil.kt)
     implementation(libs.coil.kt.compose)