diff --git a/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts b/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts index 923a0e84820..deec3f3e1eb 100644 --- a/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts +++ b/firebase-dataconnect/androidTestutil/androidTestutil.gradle.kts @@ -62,14 +62,8 @@ dependencies { implementation(libs.turbine) implementation(libs.truth) - implementation("com.google.firebase:firebase-auth:22.3.1") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } - implementation("com.google.firebase:firebase-appcheck:18.0.0") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } + implementation("com.google.firebase:firebase-auth:22.3.1") + implementation("com.google.firebase:firebase-appcheck:18.0.0") } tasks.withType().all { diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts index 9c2b9b80d8f..e0bd7fac3d4 100644 --- a/firebase-dataconnect/firebase-dataconnect.gradle.kts +++ b/firebase-dataconnect/firebase-dataconnect.gradle.kts @@ -117,18 +117,10 @@ dependencies { api(libs.kotlinx.serialization.core) implementation("com.google.firebase:firebase-annotations:16.2.0") - implementation("com.google.firebase:firebase-components:18.0.0") { - exclude(group = "com.google.firebase", module = "firebase-common") - } + implementation("com.google.firebase:firebase-components:18.0.0") implementation(project(":protolite-well-known-types")) - implementation("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") - } - implementation("com.google.firebase:firebase-appcheck-interop:17.1.0") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } + implementation("com.google.firebase:firebase-auth-interop:20.0.0") + implementation("com.google.firebase:firebase-appcheck-interop:17.1.0") compileOnly(libs.javax.annotation.jsr250) implementation(libs.grpc.android) @@ -155,14 +147,8 @@ dependencies { androidTestImplementation(project(":firebase-dataconnect:androidTestutil")) androidTestImplementation(project(":firebase-dataconnect:connectors")) androidTestImplementation(project(":firebase-dataconnect:testutil")) - androidTestImplementation("com.google.firebase:firebase-auth:22.3.1") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } - androidTestImplementation("com.google.firebase:firebase-appcheck:18.0.0") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } + androidTestImplementation("com.google.firebase:firebase-auth:22.3.1") + androidTestImplementation("com.google.firebase:firebase-appcheck:18.0.0") androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.junit) androidTestImplementation(libs.androidx.test.rules) diff --git a/firebase-dataconnect/testutil/testutil.gradle.kts b/firebase-dataconnect/testutil/testutil.gradle.kts index 3a58590a50e..26c2162ecd0 100644 --- a/firebase-dataconnect/testutil/testutil.gradle.kts +++ b/firebase-dataconnect/testutil/testutil.gradle.kts @@ -53,13 +53,8 @@ dependencies { api(libs.kotlinx.coroutines.core) api(libs.kotlinx.serialization.core) - implementation("com.google.firebase:firebase-components:18.0.0") { - exclude(group = "com.google.firebase", module = "firebase-common") - } - implementation("com.google.firebase:firebase-auth:22.3.1") { - exclude(group = "com.google.firebase", module = "firebase-common") - exclude(group = "com.google.firebase", module = "firebase-components") - } + implementation("com.google.firebase:firebase-components:18.0.0") + implementation("com.google.firebase:firebase-auth:22.3.1") implementation(libs.kotest.property) implementation(libs.mockk)