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 1 commit
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
2 changes: 1 addition & 1 deletion 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,7 +54,7 @@ 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 libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'

implementation libs.androidx.test.core
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -50,7 +50,7 @@ dependencies {

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:17.0.0'
api 'com.google.firebase:firebase-common:22.0.0'
api libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'
implementation platform(libs.kotlin.bom)

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -50,7 +50,7 @@ dependencies {

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:17.0.0'
api 'com.google.firebase:firebase-common:22.0.0'
api libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'

implementation libs.playservices.base
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +49,7 @@ dependencies {
implementation(libs.dagger.dagger)

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-common'
api libs.firebase.common
api 'com.google.firebase:firebase-components'
api 'com.google.android.recaptcha:recaptcha:18.7.1'

Expand Down
2 changes: 1 addition & 1 deletion appcheck/firebase-appcheck/firebase-appcheck.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
api libs.playservices.tasks
api 'com.google.firebase:firebase-annotations:17.0.0'
api "com.google.firebase:firebase-appcheck-interop:17.1.0"
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")

implementation libs.androidx.annotation
Expand Down
2 changes: 1 addition & 1 deletion firebase-abt/firebase-abt.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-common:22.0.0'
api libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'

implementation libs.playservices.basement
Expand Down
2 changes: 1 addition & 1 deletion firebase-ai/firebase-ai.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ dependencies {
implementation(libs.ktor.serialization.kotlinx.json)
implementation(libs.ktor.client.logging)

api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
implementation("com.google.firebase:firebase-components:19.0.0")
implementation("com.google.firebase:firebase-annotations:17.0.0")
implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
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) }
2 changes: 1 addition & 1 deletion 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,7 +53,7 @@ android {

dependencies {
api libs.playservices.tasks
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")

implementation libs.androidx.annotation
Expand Down
2 changes: 1 addition & 1 deletion firebase-appdistribution/firebase-appdistribution.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ 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 libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'
api('com.google.firebase:firebase-installations-interop:17.1.0') {
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-config/firebase-config.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ 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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
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-crashlytics-ndk/firebase-crashlytics-ndk.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ thirdPartyLicenses {

dependencies {
api project(':firebase-crashlytics')
api "com.google.firebase:firebase-common:22.0.0"
api libs.firebase.common
api "com.google.firebase:firebase-components:19.0.0"

implementation libs.playservices.basement
Expand Down
2 changes: 1 addition & 1 deletion firebase-crashlytics/firebase-crashlytics.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ 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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-config-interop:16.0.1")
api("com.google.firebase:firebase-encoders:17.0.0")
Expand Down
2 changes: 1 addition & 1 deletion firebase-database/firebase-database.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ android {

dependencies {
api("com.google.firebase:firebase-appcheck-interop:17.1.0")
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-auth-interop:20.0.0") {
exclude(group = "com.google.firebase", module = "firebase-common")
Expand Down
2 changes: 1 addition & 1 deletion firebase-dataconnect/firebase-dataconnect.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ 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("com.google.firebase:firebase-appcheck-interop:17.1.0")
Expand Down
2 changes: 1 addition & 1 deletion firebase-datatransport/firebase-datatransport.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-common:22.0.0'
api libs.firebase.common
api 'com.google.firebase:firebase-components:19.0.0'

implementation libs.androidx.annotation
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +67,7 @@ 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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api('com.google.firebase:firebase-measurement-connector:19.0.0') {
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ dependencies {
exclude group: "com.google.firebase", module: "firebase-common"
}

api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api('com.google.firebase:firebase-database-collection:18.0.1')

Expand Down
2 changes: 1 addition & 1 deletion firebase-functions/firebase-functions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ 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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-annotations:17.0.0")
api("com.google.firebase:firebase-auth-interop:18.0.0") {
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +88,7 @@ dependencies {
}

api(project(":firebase-inappmessaging"))
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")

implementation libs.androidx.annotation
Expand Down
2 changes: 1 addition & 1 deletion firebase-inappmessaging/firebase-inappmessaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ 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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-datatransport:18.2.0"){
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-installations/firebase-installations.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {

api libs.playservices.tasks
api 'com.google.firebase:firebase-annotations:17.0.0'
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-installations-interop:17.1.1")

Expand Down
2 changes: 1 addition & 1 deletion firebase-messaging/firebase-messaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ android {
dependencies {
javadocClasspath libs.autovalue.annotations

api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api('com.google.firebase:firebase-datatransport:18.2.0') {
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {

api libs.playservices.tasks
api 'com.google.firebase:firebase-annotations:17.0.0'
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api('com.google.firebase:firebase-datatransport:18.2.0'){
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-perf/firebase-perf.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ dependencies {
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(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")
api("com.google.firebase:firebase-config:21.5.0") {
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
Expand Down
2 changes: 1 addition & 1 deletion firebase-sessions/firebase-sessions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ 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("com.google.firebase:firebase-installations-interop:17.2.0") {
Expand Down
2 changes: 1 addition & 1 deletion firebase-storage/firebase-storage.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dependencies {
exclude group: "com.google.firebase", module: "firebase-components"
exclude group: "com.google.firebase", module: "firebase-annotations"
}
api("com.google.firebase:firebase-common:22.0.0")
api(libs.firebase.common)
api("com.google.firebase:firebase-components:19.0.0")

implementation libs.androidx.annotation
Expand Down
Loading