From b1981312536749bb0c4c1ddb2d611ffb428c167e Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 11 Jul 2025 10:14:49 -0400 Subject: [PATCH 1/3] [Infra] Temporarily move some dependencies to project level To ensure that the next release does not contain projects that depend on an older artifact that still pulls any of the ktx artifacts, some of the inter-sdk dependencies need to be moved to project level. This change should be reverted once all new artifacts are released. --- firebase-appdistribution/firebase-appdistribution.gradle | 5 +++-- firebase-config/bandwagoner/bandwagoner.gradle | 1 + firebase-config/firebase-config.gradle.kts | 4 +++- firebase-config/test-app/test-app.gradle.kts | 4 +++- firebase-crashlytics/firebase-crashlytics.gradle | 4 +++- firebase-inappmessaging/firebase-inappmessaging.gradle | 4 +++- firebase-messaging/firebase-messaging.gradle | 4 +++- .../firebase-ml-modeldownloader.gradle | 4 +++- firebase-perf/firebase-perf.gradle | 9 +++++++-- firebase-sessions/firebase-sessions.gradle.kts | 1 + firebase-storage/firebase-storage.gradle | 3 ++- 11 files changed, 32 insertions(+), 11 deletions(-) diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle index 2d25c51972d..5610e265c7d 100644 --- a/firebase-appdistribution/firebase-appdistribution.gradle +++ b/firebase-appdistribution/firebase-appdistribution.gradle @@ -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' } @@ -81,8 +81,9 @@ dependencies { compileOnly libs.autovalue.annotations - runtimeOnly('com.google.firebase:firebase-installations:17.1.3') { + runtimeOnly('com.google.firebase:firebase-installations:18.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' +exclude group: 'com.google.firebase', module: 'firebase-common-ktx' exclude group: 'com.google.firebase', module: 'firebase-components' } diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle index 98d789a5f14..a24d327d1b9 100644 --- a/firebase-config/bandwagoner/bandwagoner.gradle +++ b/firebase-config/bandwagoner/bandwagoner.gradle @@ -77,6 +77,7 @@ dependencies { } implementation(project(":firebase-installations")) { exclude group: 'com.google.firebase', module: 'firebase-common' + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' exclude group: 'com.google.firebase', module: 'firebase-components' } implementation libs.androidx.annotation diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts index 2cb45bac43d..b666a759888 100644 --- a/firebase-config/firebase-config.gradle.kts +++ b/firebase-config/firebase-config.gradle.kts @@ -73,7 +73,9 @@ dependencies { } api("com.google.firebase:firebase-common:22.0.0") api("com.google.firebase:firebase-components:19.0.0") - api("com.google.firebase:firebase-installations:17.2.0") + api("com.google.firebase:firebase-installations:17.2.0") { + exclude(group = "com.google.firebase", module = "firebase-common-ktx") + } // Kotlin & Android implementation(libs.kotlin.stdlib) diff --git a/firebase-config/test-app/test-app.gradle.kts b/firebase-config/test-app/test-app.gradle.kts index 30c148c0964..b3cfd04ffb8 100644 --- a/firebase-config/test-app/test-app.gradle.kts +++ b/firebase-config/test-app/test-app.gradle.kts @@ -65,7 +65,9 @@ dependencies { implementation("com.google.firebase:firebase-components:19.0.0") implementation("com.google.firebase:firebase-installations-interop:17.1.0") - runtimeOnly("com.google.firebase:firebase-installations:17.1.4") + runtimeOnly("com.google.firebase:firebase-installations:18.0.0") { + exclude(group = "com.google.firebase", module = "firebase-common-ktx") + } implementation("com.google.android.gms:play-services-basement:18.1.0") implementation("com.google.android.gms:play-services-tasks:18.0.1") diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle index 5cb9331a89a..9a834fff4b0 100644 --- a/firebase-crashlytics/firebase-crashlytics.gradle +++ b/firebase-crashlytics/firebase-crashlytics.gradle @@ -76,7 +76,9 @@ 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("com.google.firebase:firebase-installations:18.0.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } api("com.google.firebase:firebase-installations-interop:17.2.0") api("com.google.firebase:firebase-measurement-connector:20.0.1") diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle index 5e6b9e9a8ca..84aee61e0d9 100644 --- a/firebase-inappmessaging/firebase-inappmessaging.gradle +++ b/firebase-inappmessaging/firebase-inappmessaging.gradle @@ -123,7 +123,9 @@ 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("com.google.firebase:firebase-installations:18.0.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } 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' diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle index f53f919f095..ca4c98010bf 100644 --- a/firebase-messaging/firebase-messaging.gradle +++ b/firebase-messaging/firebase-messaging.gradle @@ -99,7 +99,9 @@ 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("com.google.firebase:firebase-installations:18.0.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } api('com.google.firebase:firebase-installations-interop:17.1.0') api('com.google.firebase:firebase-measurement-connector:19.0.0') diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle index 7bbc32967ce..f43e6d83db9 100644 --- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle +++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle @@ -96,7 +96,9 @@ 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("com.google.firebase:firebase-installations:18.0.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' +} api 'com.google.firebase:firebase-installations-interop:17.1.0' implementation 'androidx.annotation:annotation:1.1.0' diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index 708c5a3dd4b..8feb191efaf 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -115,8 +115,13 @@ dependencies { implementation libs.okhttp api("com.google.firebase:firebase-common:22.0.0") api("com.google.firebase:firebase-components:19.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-config:21.5.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + +} + api("com.google.firebase:firebase-installations:18.0.0") { + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' +} 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' diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts index 4e8b5c0f07a..d739da82f33 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -89,6 +89,7 @@ dependencies { runtimeOnly("com.google.firebase:firebase-installations:18.0.0") { exclude(group = "com.google.firebase", module = "firebase-common") + exclude(group = "com.google.firebase", module = "firebase-common-ktx") exclude(group = "com.google.firebase", module = "firebase-components") } runtimeOnly("com.google.firebase:firebase-datatransport:19.0.0") { diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle index 36a00f9a816..7f0552c3c05 100644 --- a/firebase-storage/firebase-storage.gradle +++ b/firebase-storage/firebase-storage.gradle @@ -87,8 +87,9 @@ dependencies { javadocClasspath libs.findbugs.jsr305 api("com.google.firebase:firebase-annotations:17.0.0") - api("com.google.firebase:firebase-appcheck:17.1.0") { + api("com.google.firebase:firebase-appcheck:18.0.0") { exclude group: "com.google.firebase", module: "firebase-common" + exclude group: "com.google.firebase", module: "firebase-common-ktx" exclude group: "com.google.firebase", module: "firebase-components" exclude group: "com.google.firebase", module: "firebase-annotations" } From 3ea2f624e9bd8b7a68a3bbe042d625d94afc7dc4 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 11 Jul 2025 10:23:39 -0400 Subject: [PATCH 2/3] Fix format --- firebase-appdistribution/firebase-appdistribution.gradle | 2 +- firebase-inappmessaging/firebase-inappmessaging.gradle | 2 +- .../firebase-ml-modeldownloader.gradle | 4 ++-- firebase-perf/firebase-perf.gradle | 9 ++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle index 5610e265c7d..9c78f05c954 100644 --- a/firebase-appdistribution/firebase-appdistribution.gradle +++ b/firebase-appdistribution/firebase-appdistribution.gradle @@ -83,7 +83,7 @@ dependencies { runtimeOnly('com.google.firebase:firebase-installations:18.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' -exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' exclude group: 'com.google.firebase', module: 'firebase-components' } diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle index 84aee61e0d9..1a711fc1b7d 100644 --- a/firebase-inappmessaging/firebase-inappmessaging.gradle +++ b/firebase-inappmessaging/firebase-inappmessaging.gradle @@ -124,7 +124,7 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-components' } api("com.google.firebase:firebase-installations:18.0.0") { - exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' } api 'com.google.firebase:firebase-installations-interop:17.1.0' api('com.google.firebase:firebase-measurement-connector:18.0.2') { diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle index f43e6d83db9..8ed98f01116 100644 --- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle +++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle @@ -97,8 +97,8 @@ 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:18.0.0") { - exclude group: 'com.google.firebase', module: 'firebase-common-ktx' -} + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } api 'com.google.firebase:firebase-installations-interop:17.1.0' implementation 'androidx.annotation:annotation:1.1.0' diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index 8feb191efaf..54a8a232c71 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -116,12 +116,11 @@ dependencies { api("com.google.firebase:firebase-common:22.0.0") 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' - -} + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } api("com.google.firebase:firebase-installations:18.0.0") { - exclude group: 'com.google.firebase', module: 'firebase-common-ktx' -} + exclude group: 'com.google.firebase', module: 'firebase-common-ktx' + } 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' From a39d1135ce02c785c004a3749966978e3f591815 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 11 Jul 2025 13:22:50 -0400 Subject: [PATCH 3/3] Bump installations in config --- firebase-config/firebase-config.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts index b666a759888..d1dffa70c23 100644 --- a/firebase-config/firebase-config.gradle.kts +++ b/firebase-config/firebase-config.gradle.kts @@ -73,7 +73,7 @@ dependencies { } api("com.google.firebase:firebase-common:22.0.0") api("com.google.firebase:firebase-components:19.0.0") - api("com.google.firebase:firebase-installations:17.2.0") { + api("com.google.firebase:firebase-installations:18.0.0") { exclude(group = "com.google.firebase", module = "firebase-common-ktx") }