[Infra] Move all infra dependencies to the catalog (#7355)

rlazo · web-flow · commit acaacbd02952 · 2025-09-10T18:02:21.000Z
Given that all SDKs have a dependency on the infra SDKs (i.e.
`firebase-annotations`, `firebase-components`, and `firebase-common`),
it's easier to manage, update, and audit them if they are in a
centralized place. Moving them all to the version catalog.
diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -54,8 +54,8 @@ dependencies {
     api project(':appcheck:firebase-appcheck')
     api project(':appcheck:firebase-appcheck-debug')
     api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.common
+    api libs.firebase.components
 
     implementation libs.androidx.test.core
     implementation libs.playservices.base
diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -49,9 +49,9 @@ dependencies {
     javadocClasspath libs.autovalue.annotations
 
     api project(':appcheck:firebase-appcheck')
-    api 'com.google.firebase:firebase-annotations:17.0.0'
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.annotations
+    api libs.firebase.common
+    api libs.firebase.components
     implementation platform(libs.kotlin.bom)
 
     implementation libs.playservices.base
diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -49,9 +49,9 @@ dependencies {
     javadocClasspath libs.autovalue.annotations
 
     api project(':appcheck:firebase-appcheck')
-    api 'com.google.firebase:firebase-annotations:17.0.0'
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.annotations
+    api libs.firebase.common
+    api libs.firebase.components
 
     implementation libs.playservices.base
     implementation libs.playservices.tasks
diff --git a/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle b/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle
@@ -49,8 +49,8 @@ dependencies {
     implementation(libs.dagger.dagger)
 
     api project(':appcheck:firebase-appcheck')
-    api 'com.google.firebase:firebase-common'
-    api 'com.google.firebase:firebase-components'
+    api libs.firebase.common
+    api libs.firebase.components
     api 'com.google.android.recaptcha:recaptcha:18.7.1'
 
     annotationProcessor(libs.dagger.compiler)
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -51,10 +51,10 @@ dependencies {
     javadocClasspath libs.autovalue.annotations
 
     api libs.playservices.tasks
-    api 'com.google.firebase:firebase-annotations:17.0.0'
+    api libs.firebase.annotations
     api "com.google.firebase:firebase-appcheck-interop:17.1.0"
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
 
     implementation libs.androidx.annotation
     implementation libs.playservices.base
diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle
@@ -51,8 +51,8 @@ android {
 }
 
 dependencies {
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.common
+    api libs.firebase.components
 
     implementation libs.playservices.basement
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
diff --git a/firebase-ai/CHANGELOG.md b/firebase-ai/CHANGELOG.md
@@ -22,13 +22,11 @@
 
 * [changed] Added a `dilation` parameter to `ImagenMaskReference.generateMaskAndPadForOutpainting`
   (#7260)
-* [feature] Added support for limited-use tokens with Firebase App Check.
-  These limited-use tokens are required for an upcoming optional feature called
-  _replay protection_. We recommend
+* [feature] Added support for limited-use tokens with Firebase App Check. These limited-use tokens
+  are required for an upcoming optional feature called _replay protection_. We recommend
   [enabling the usage of limited-use tokens](https://firebase.google.com/docs/ai-logic/app-check)
-  now so that when replay protection becomes available, you can enable it sooner
-  because more of your users will be on versions of your app that send limited-use tokens.
-  (#7285)
+  now so that when replay protection becomes available, you can enable it sooner because more of
+  your users will be on versions of your app that send limited-use tokens. (#7285)
 
 # 17.1.0
 
diff --git a/firebase-ai/firebase-ai.gradle.kts b/firebase-ai/firebase-ai.gradle.kts
@@ -95,9 +95,9 @@ dependencies {
   implementation(libs.ktor.serialization.kotlinx.json)
   implementation(libs.ktor.client.logging)
 
-  api("com.google.firebase:firebase-common:22.0.0")
-  implementation("com.google.firebase:firebase-components:19.0.0")
-  implementation("com.google.firebase:firebase-annotations:17.0.0")
+  api(libs.firebase.common)
+  implementation(libs.firebase.components)
+  implementation(libs.firebase.annotations)
   implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
   implementation(libs.androidx.annotation)
   implementation(libs.kotlinx.serialization.json)
diff --git a/firebase-annotations/firebase-annotations.gradle.kts b/firebase-annotations/firebase-annotations.gradle.kts
@@ -24,6 +24,6 @@ java {
   targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<JavaCompile> { options.compilerArgs.add("-Werror") }
+tasks.withType<JavaCompile> { options.compilerArgs.addAll(listOf("-Werror", "-Xlint:-options")) }
 
 dependencies { implementation(libs.javax.inject) }
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -53,8 +53,8 @@ android {
 
 dependencies {
     api libs.playservices.tasks
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
 
     implementation libs.androidx.annotation
     implementation libs.kotlin.stdlib
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -65,8 +65,8 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.common
+    api libs.firebase.components
     api('com.google.firebase:firebase-installations-interop:17.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts
@@ -35,7 +35,7 @@ android {
 
 dependencies {
   implementation("com.google.firebase:firebase-common:22.0.0")
-  implementation("com.google.firebase:firebase-components:19.0.0")
+  implementation(libs.firebase.components)
   implementation(platform(libs.kotlin.bom))
 
   testImplementation(libs.androidx.core)
diff --git a/firebase-common/firebase-common.gradle.kts b/firebase-common/firebase-common.gradle.kts
@@ -55,8 +55,8 @@ android {
 dependencies {
   api(libs.kotlin.coroutines.tasks)
 
-  api("com.google.firebase:firebase-components:19.0.0")
-  api("com.google.firebase:firebase-annotations:17.0.0")
+  api(libs.firebase.components)
+  api(libs.firebase.annotations)
   implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.annotation)
   implementation(libs.androidx.futures)
diff --git a/firebase-components/firebase-components.gradle.kts b/firebase-components/firebase-components.gradle.kts
@@ -44,7 +44,7 @@ android {
 }
 
 dependencies {
-  api("com.google.firebase:firebase-annotations:17.0.0")
+  api(libs.firebase.annotations)
   implementation(libs.androidx.annotation)
   implementation(libs.errorprone.annotations)
 
diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -93,7 +93,7 @@ dependencies {
     // Released artifacts don't need these dependencies since they don't use `project` to refer
     // to Remote Config.
     implementation("com.google.firebase:firebase-common:22.0.0")
-    implementation("com.google.firebase:firebase-components:19.0.0")
+    implementation(libs.firebase.components)
     implementation("com.google.firebase:firebase-installations-interop:17.1.1") {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts
@@ -61,7 +61,7 @@ android {
 dependencies {
   // Firebase
   api("com.google.firebase:firebase-config-interop:16.0.1")
-  api("com.google.firebase:firebase-annotations:17.0.0")
+  api(libs.firebase.annotations)
   api("com.google.firebase:firebase-installations-interop:17.1.0")
   api("com.google.firebase:firebase-abt:21.1.1") {
     exclude(group = "com.google.firebase", module = "firebase-common")
@@ -71,8 +71,8 @@ dependencies {
     exclude(group = "com.google.firebase", module = "firebase-common")
     exclude(group = "com.google.firebase", module = "firebase-components")
   }
-  api("com.google.firebase:firebase-common:22.0.0")
-  api("com.google.firebase:firebase-components:19.0.0")
+  api(libs.firebase.common)
+  api(libs.firebase.components)
   api("com.google.firebase:firebase-installations:18.0.0") {
     exclude(group = "com.google.firebase", module = "firebase-common-ktx")
   }
diff --git a/firebase-config/test-app/test-app.gradle.kts b/firebase-config/test-app/test-app.gradle.kts
@@ -62,7 +62,7 @@ dependencies {
   // Released artifacts don't need these dependencies since they don't use `project` to refer
   // to Remote Config.
   implementation("com.google.firebase:firebase-common:22.0.0")
-  implementation("com.google.firebase:firebase-components:19.0.0")
+  implementation(libs.firebase.components)
 
   implementation("com.google.firebase:firebase-installations-interop:17.1.0")
   runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -110,8 +110,8 @@ thirdPartyLicenses {
 
 dependencies {
     api project(':firebase-crashlytics')
-    api "com.google.firebase:firebase-common:22.0.0"
-    api "com.google.firebase:firebase-components:19.0.0"
+    api libs.firebase.common
+    api libs.firebase.components
 
     implementation libs.playservices.basement
 
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -70,9 +70,9 @@ dependencies {
 
     api(project(":firebase-sessions"))
     api(libs.playservices.tasks)
-    api("com.google.firebase:firebase-annotations:17.0.0")
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.annotations)
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api("com.google.firebase:firebase-config-interop:16.0.1")
     api("com.google.firebase:firebase-encoders:17.0.0")
     api("com.google.firebase:firebase-encoders-json:18.0.1")
diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts
@@ -66,8 +66,8 @@ android {
 
 dependencies {
   api("com.google.firebase:firebase-appcheck-interop:17.1.0")
-  api("com.google.firebase:firebase-common:22.0.0")
-  api("com.google.firebase:firebase-components:19.0.0")
+  api(libs.firebase.common)
+  api(libs.firebase.components)
   api("com.google.firebase:firebase-auth-interop:20.0.0") {
     exclude(group = "com.google.firebase", module = "firebase-common")
     exclude(group = "com.google.firebase", module = "firebase-components")
diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts
@@ -103,12 +103,12 @@ protobuf {
 }
 
 dependencies {
-  api("com.google.firebase:firebase-common:22.0.0")
+  api(libs.firebase.common)
 
-  implementation("com.google.firebase:firebase-annotations:17.0.0")
+  implementation(libs.firebase.annotations)
   implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
   implementation("com.google.firebase:firebase-auth-interop:20.0.0")
-  implementation("com.google.firebase:firebase-components:19.0.0")
+  implementation(libs.firebase.components)
 
   compileOnly(libs.javax.annotation.jsr250)
   compileOnly(libs.kotlinx.datetime)
diff --git a/firebase-dataconnect/testutil/testutil.gradle.kts b/firebase-dataconnect/testutil/testutil.gradle.kts
@@ -60,7 +60,7 @@ kotlin {
 dependencies {
   implementation(project(":firebase-dataconnect"))
 
-  implementation("com.google.firebase:firebase-components:19.0.0")
+  implementation(libs.firebase.components)
   implementation("com.google.firebase:firebase-auth:22.3.1")
 
   compileOnly(libs.kotlinx.datetime)
diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle
@@ -49,8 +49,8 @@ android {
 }
 
 dependencies {
-    api 'com.google.firebase:firebase-common:22.0.0'
-    api 'com.google.firebase:firebase-components:19.0.0'
+    api libs.firebase.common
+    api libs.firebase.components
 
     implementation libs.androidx.annotation
     implementation 'com.google.android.datatransport:transport-api:3.1.0'
diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -67,8 +67,8 @@ dependencies {
     api('com.google.firebase:firebase-auth-interop:20.0.0') {
          exclude group: "com.google.firebase", module: "firebase-common"
      }
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api('com.google.firebase:firebase-measurement-connector:19.0.0') {
          exclude group: 'com.google.firebase', module: 'firebase-common'
      }
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -122,14 +122,14 @@ dependencies {
 
     api project(':protolite-well-known-types')
     api libs.playservices.tasks
-    api 'com.google.firebase:firebase-annotations:17.0.0'
+    api libs.firebase.annotations
     api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
     api('com.google.firebase:firebase-auth-interop:19.0.2') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
 
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api('com.google.firebase:firebase-database-collection:18.0.1')
 
     implementation libs.androidx.annotation
diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts
@@ -77,9 +77,9 @@ dependencies {
   javadocClasspath(libs.findbugs.jsr305)
 
   api("com.google.firebase:firebase-appcheck-interop:17.1.0")
-  api("com.google.firebase:firebase-common:22.0.0")
-  api("com.google.firebase:firebase-components:19.0.0")
-  api("com.google.firebase:firebase-annotations:17.0.0")
+  api(libs.firebase.common)
+  api(libs.firebase.components)
+  api(libs.firebase.annotations)
   api("com.google.firebase:firebase-auth-interop:18.0.0") {
     exclude(group = "com.google.firebase", module = "firebase-common")
   }
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -88,8 +88,8 @@ dependencies {
      }
 
     api(project(":firebase-inappmessaging"))
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
 
     implementation libs.androidx.annotation
     implementation libs.androidx.appcompat
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -117,8 +117,8 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
      }
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api("com.google.firebase:firebase-datatransport:18.2.0"){
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
diff --git a/firebase-installations-interop/firebase-installations-interop.gradle b/firebase-installations-interop/firebase-installations-interop.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-    api 'com.google.firebase:firebase-annotations:17.0.0'
+    api libs.firebase.annotations
 
     implementation libs.playservices.tasks
 
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
@@ -52,9 +52,9 @@ dependencies {
     javadocClasspath libs.findbugs.jsr305
 
     api libs.playservices.tasks
-    api 'com.google.firebase:firebase-annotations:17.0.0'
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api libs.firebase.annotations
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api("com.google.firebase:firebase-installations-interop:17.1.1")
 
     implementation libs.kotlin.stdlib
diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle
@@ -89,8 +89,8 @@ android {
 dependencies {
         javadocClasspath libs.autovalue.annotations
 
-        api("com.google.firebase:firebase-common:22.0.0")
-        api("com.google.firebase:firebase-components:19.0.0")
+        api(libs.firebase.common)
+        api(libs.firebase.components)
         api('com.google.firebase:firebase-datatransport:18.2.0') {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -87,9 +87,9 @@ dependencies {
      }
 
     api libs.playservices.tasks
-    api 'com.google.firebase:firebase-annotations:17.0.0'
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api libs.firebase.annotations
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api('com.google.firebase:firebase-datatransport:18.2.0'){
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
@@ -109,12 +109,12 @@ dependencies {
     implementation libs.androidx.appcompat
     implementation 'com.google.android.datatransport:transport-api:3.0.0'
     implementation libs.dagger.dagger
-    api 'com.google.firebase:firebase-annotations:17.0.0'
+    api libs.firebase.annotations
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
     api project(":protolite-well-known-types")
     implementation libs.okhttp
-    api("com.google.firebase:firebase-common:22.0.0")
-    api("com.google.firebase:firebase-components:19.0.0")
+    api(libs.firebase.common)
+    api(libs.firebase.components)
     api("com.google.firebase:firebase-config:21.5.0") {
         exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
     }
diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- api 'com.google.firebase:firebase-common:22.0.0'`
`55`		`- api 'com.google.firebase:firebase-components:19.0.0'`
	`54`	`+ api libs.firebase.common`
	`55`	`+ api libs.firebase.components`
`56`	`56`
`57`	`57`	`implementation libs.playservices.basement`
`58`	`58`	`implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ java {`
`24`	`24`	`targetCompatibility = JavaVersion.VERSION_1_8`
`25`	`25`	`}`
`26`	`26`
`27`		`-tasks.withType<JavaCompile> { options.compilerArgs.add("-Werror") }`
	`27`	`+tasks.withType<JavaCompile> { options.compilerArgs.addAll(listOf("-Werror", "-Xlint:-options")) }`
`28`	`28`
`29`	`29`	`dependencies { implementation(libs.javax.inject) }`