Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 10, 2025
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
267a99a
[Infra] Move all dependencies for firebase-common to the catalog
rlazo Sep 9, 2025
1e0ce48
Include components & annotations in the change too
rlazo Sep 9, 2025
f09a261
Merge branch 'main' into common_dep
rlazo Sep 9, 2025
2d46bba
Fix changelog format
rlazo Sep 10, 2025
a48f93d
Merge branch 'main' into common_dep
rlazo Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions firebase-abt/firebase-abt.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
6 changes: 3 additions & 3 deletions firebase-ai/firebase-ai.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion firebase-annotations/firebase-annotations.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
4 changes: 2 additions & 2 deletions firebase-appdistribution-api/firebase-appdistribution-api.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions firebase-appdistribution/firebase-appdistribution.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion firebase-common/data-collection-tests/data-collection-tests.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions firebase-common/firebase-common.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion firebase-components/firebase-components.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion firebase-config/bandwagoner/bandwagoner.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions firebase-config/firebase-config.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion firebase-config/test-app/test-app.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
4 changes: 2 additions & 2 deletions firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions firebase-crashlytics/firebase-crashlytics.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions firebase-database/firebase-database.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions firebase-dataconnect/firebase-dataconnect.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,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)
Expand Down
2 changes: 1 addition & 1 deletion firebase-dataconnect/testutil/testutil.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions firebase-datatransport/firebase-datatransport.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions firebase-dynamic-links/firebase-dynamic-links.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
6 changes: 3 additions & 3 deletions firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions firebase-functions/firebase-functions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions firebase-inappmessaging/firebase-inappmessaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion firebase-installations-interop/firebase-installations-interop.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-annotations:17.0.0'
api libs.firebase.annotations

implementation libs.playservices.tasks

Expand Down
6 changes: 3 additions & 3 deletions firebase-installations/firebase-installations.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions firebase-messaging/firebase-messaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions firebase-perf/firebase-perf.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
6 changes: 3 additions & 3 deletions firebase-sessions/firebase-sessions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java).
}

dependencies {
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)

api("com.google.firebase:firebase-components:19.0.0")
api(libs.firebase.components)
api("com.google.firebase:firebase-installations-interop:17.2.0") {
exclude(group = "com.google.firebase", module = "firebase-common")
exclude(group = "com.google.firebase", module = "firebase-components")
}

api("com.google.firebase:firebase-annotations:17.0.0")
api(libs.firebase.annotations)
api("com.google.firebase:firebase-encoders:17.0.0")
api("com.google.firebase:firebase-encoders-json:18.0.1")

Expand Down
Loading
Loading