diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle index 2d25c51972d..c2a0da96adf 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,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' } diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts index 2cb45bac43d..ac7bbdc9ad2 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(project(":firebase-installations")) // 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..dd8de340a24 100644 --- a/firebase-config/test-app/test-app.gradle.kts +++ b/firebase-config/test-app/test-app.gradle.kts @@ -65,7 +65,7 @@ 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(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") diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle index 5cb9331a89a..5460af1bb60 100644 --- a/firebase-crashlytics/firebase-crashlytics.gradle +++ b/firebase-crashlytics/firebase-crashlytics.gradle @@ -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") diff --git a/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts b/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts index 973ae52ad16..31fcd4ac46e 100644 --- a/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts +++ b/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts @@ -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) diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts index e22da6da2a0..a1647b38659 100644 --- a/firebase-dataconnect/firebase-dataconnect.gradle.kts +++ b/firebase-dataconnect/firebase-dataconnect.gradle.kts @@ -96,7 +96,9 @@ dependencies { implementation("com.google.firebase:firebase-annotations:17.0.0") 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-auth-interop:20.0.0") { + exclude(group="com.google.firebase", module="firebase-common-ktx") + } implementation("com.google.firebase:firebase-components:19.0.0") compileOnly(libs.javax.annotation.jsr250) @@ -127,7 +129,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) diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle index 5e6b9e9a8ca..ace8108cce0 100644 --- a/firebase-inappmessaging/firebase-inappmessaging.gradle +++ b/firebase-inappmessaging/firebase-inappmessaging.gradle @@ -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' diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle index f53f919f095..30617315012 100644 --- a/firebase-messaging/firebase-messaging.gradle +++ b/firebase-messaging/firebase-messaging.gradle @@ -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') diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle index 7bbc32967ce..a101af03890 100644 --- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle +++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle @@ -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' diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index 708c5a3dd4b..44a84e46ab9 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -115,8 +115,8 @@ 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(project(":firebase-config")) + api(project(":firebase-installations")) 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..a7fa719073a 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -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") } diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle index 36a00f9a816..ad3893512e3 100644 --- a/firebase-storage/firebase-storage.gradle +++ b/firebase-storage/firebase-storage.gradle @@ -87,7 +87,7 @@ dependencies { javadocClasspath libs.findbugs.jsr305 api("com.google.firebase:firebase-annotations:17.0.0") - api("com.google.firebase:firebase-appcheck:17.1.0") { + api(project(":appcheck:firebase-appcheck")) { exclude group: "com.google.firebase", module: "firebase-common" exclude group: "com.google.firebase", module: "firebase-components" exclude group: "com.google.firebase", module: "firebase-annotations"