Skip to content

[Infra] Temporarily move some dependencies to project level #7142

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

Closed
wants to merge 5 commits into from
Closed

[Infra] Temporarily move some dependencies to project level #7142

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
d9c5fb5
[Infra] Temporarily move some dependencies to project level
rlazo Jul 10, 2025
3923c1e
Merge branch 'main' into rl.project.deps
rlazo Jul 10, 2025
027b5dc
Remove merge markers
rlazo Jul 10, 2025
aa93815
Remove additional merge marks from files
rlazo Jul 10, 2025
9f76e31
Merge branch 'main' into rl.project.deps
rlazo Jul 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 firebase-appdistribution/firebase-appdistribution.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
exclude group: "javax.inject", module: "javax.inject"
}

api("com.google.firebase:firebase-appdistribution-api:16.0.0-beta11") {
api(project(":firebase-appdistribution-api")) {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
Expand All @@ -81,7 +81,7 @@ dependencies {

compileOnly libs.autovalue.annotations

runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
runtimeOnly(project(':firebase-installations')) {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
Expand Down
6 changes: 6 additions & 0 deletions firebase-config/firebase-config.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,15 @@ dependencies {
exclude(group = "com.google.firebase", module = "firebase-common")
exclude(group = "com.google.firebase", module = "firebase-components")
}
<<<<<<< Updated upstream
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
api("com.google.firebase:firebase-installations:17.2.0")
=======
api("com.google.firebase:firebase-common:22.0.0")
api("com.google.firebase:firebase-components:19.0.0")
api(project(":firebase-installations"))
>>>>>>> Stashed changes

// Kotlin & Android
implementation(libs.kotlin.stdlib)
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 @@ -65,7 +65,7 @@ dependencies {
implementation("com.google.firebase:firebase-components:18.0.0")

implementation("com.google.firebase:firebase-installations-interop:17.1.0")
runtimeOnly("com.google.firebase:firebase-installations:17.1.4")
runtimeOnly(project(":firebase-installations"))

implementation("com.google.android.gms:play-services-basement:18.1.0")
implementation("com.google.android.gms:play-services-tasks:18.0.1")
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 @@ -76,7 +76,7 @@ dependencies {
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")
api("com.google.firebase:firebase-installations:18.0.0")
api(project(":firebase-installations"))
api("com.google.firebase:firebase-installations-interop:17.2.0")
api("com.google.firebase:firebase-measurement-connector:20.0.1")

Expand Down
2 changes: 1 addition & 1 deletion firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
implementation(project(":firebase-dataconnect:testutil"))

implementation("com.google.firebase:firebase-auth:22.3.1")
implementation("com.google.firebase:firebase-appcheck:18.0.0")
implementation(project(":appcheck:firebase-appcheck"))

implementation(libs.androidx.test.core)
implementation(libs.androidx.test.junit)
Expand Down
9 changes: 8 additions & 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 @@ -96,8 +96,15 @@ dependencies {

implementation("com.google.firebase:firebase-annotations:16.2.0")
implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
<<<<<<< Updated upstream
implementation("com.google.firebase:firebase-auth-interop:20.0.0")
implementation("com.google.firebase:firebase-components:18.0.0")
=======
implementation("com.google.firebase:firebase-auth-interop:20.0.0") {
exclude(group="com.google.firebase", module="firebase-common-ktx")
}
implementation("com.google.firebase:firebase-components:19.0.0")
>>>>>>> Stashed changes

compileOnly(libs.javax.annotation.jsr250)
compileOnly(libs.kotlinx.datetime)
Expand Down Expand Up @@ -127,7 +134,7 @@ dependencies {
androidTestImplementation(project(":firebase-dataconnect:androidTestutil"))
androidTestImplementation(project(":firebase-dataconnect:connectors"))
androidTestImplementation(project(":firebase-dataconnect:testutil"))
androidTestImplementation("com.google.firebase:firebase-appcheck:18.0.0")
androidTestImplementation(project(":appcheck:firebase-appcheck"))
androidTestImplementation("com.google.firebase:firebase-auth:22.3.1")
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.androidx.test.junit)
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 @@ -123,7 +123,7 @@ dependencies {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
api("com.google.firebase:firebase-installations:17.2.0")
api(project(":firebase-installations"))
api 'com.google.firebase:firebase-installations-interop:17.1.0'
api('com.google.firebase:firebase-measurement-connector:18.0.2') {
exclude group: 'com.google.firebase', module: 'firebase-common'
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 @@ -99,7 +99,7 @@ dependencies {
api 'com.google.firebase:firebase-encoders-json:18.0.0'
api "com.google.firebase:firebase-encoders-proto:16.0.0"
api "com.google.firebase:firebase-iid-interop:17.1.0"
api("com.google.firebase:firebase-installations:17.2.0")
api(project(":firebase-installations"))
api('com.google.firebase:firebase-installations-interop:17.1.0')
api('com.google.firebase:firebase-measurement-connector:19.0.0')

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 @@ -96,7 +96,7 @@ dependencies {
}
api 'com.google.firebase:firebase-encoders:17.0.0'
api 'com.google.firebase:firebase-encoders-json:18.0.0'
api("com.google.firebase:firebase-installations:17.2.0")
api(project(":firebase-installations"))
api 'com.google.firebase:firebase-installations-interop:17.1.0'

implementation 'androidx.annotation:annotation:1.1.0'
Expand Down
7 changes: 7 additions & 0 deletions firebase-perf/firebase-perf.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,17 @@ dependencies {
api 'com.google.firebase:firebase-installations-interop:17.1.0'
api project(":protolite-well-known-types")
implementation libs.okhttp
<<<<<<< Updated upstream
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
api("com.google.firebase:firebase-config:21.5.0")
api("com.google.firebase:firebase-installations:17.2.0")
=======
api("com.google.firebase:firebase-common:22.0.0")
api("com.google.firebase:firebase-components:19.0.0")
api(project(":firebase-config"))
api(project(":firebase-installations"))
>>>>>>> Stashed changes
api("com.google.firebase:firebase-sessions:2.0.7") {
exclude group: 'com.google.firebase', module: 'firebase-common'
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 @@ -87,7 +87,7 @@ dependencies {

compileOnly(libs.errorprone.annotations)

runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
runtimeOnly(project(":firebase-installations")) {
exclude(group = "com.google.firebase", module = "firebase-common")
exclude(group = "com.google.firebase", module = "firebase-components")
}
Expand Down
5 changes: 5 additions & 0 deletions firebase-storage/firebase-storage.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,13 @@ dependencies {
javadocClasspath libs.autovalue.annotations
javadocClasspath libs.findbugs.jsr305

<<<<<<< Updated upstream
api("com.google.firebase:firebase-annotations:16.2.0")
api("com.google.firebase:firebase-appcheck:17.1.0") {
=======
api("com.google.firebase:firebase-annotations:17.0.0")
api(project(":appcheck:firebase-appcheck")) {
>>>>>>> Stashed changes
exclude group: "com.google.firebase", module: "firebase-common"
exclude group: "com.google.firebase", module: "firebase-components"
exclude group: "com.google.firebase", module: "firebase-annotations"
Expand Down
Loading