From d96507b2b2dc5b4317260b5edf9feb44be74d363 Mon Sep 17 00:00:00 2001 From: Daymon <17409137+daymxn@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:28:57 -0500 Subject: [PATCH] Migrate SDKs to version catalog (#6389) Per [b/374135906](https://b.corp.google.com/issues/374135906), This migrates all our SDKs to use the version catalog where appropriate. This is **_ONLY_** done when the version we use in the version catalog is the same version the SDK was using, so this should be a NOP change. There may also be other dependencies that could be moved to the version catalog, but research needs to be performed for that- which is out of scope of this PR. NO_RELEASE_CHANGE --- .../firebase-appcheck-debug-testing.gradle | 12 +++--- .../firebase-appcheck-debug.gradle | 6 +-- .../firebase-appcheck-interop.gradle | 6 +-- .../firebase-appcheck-playintegrity.gradle | 8 ++-- .../firebase-appcheck.gradle | 20 +++++----- appcheck/firebase-appcheck/ktx/ktx.gradle | 8 ++-- build.gradle | 13 ------- buildSrc/build.gradle.kts | 6 +-- .../firebase-decoders-json.gradle | 6 +-- .../firebase-encoders-json.gradle | 4 +- .../firebase-encoders-proto.gradle | 2 +- .../firebase-encoders-reflective.gradle | 4 +- .../firebase-encoders.gradle | 2 +- firebase-abt/firebase-abt.gradle | 4 +- .../firebase-appdistribution-api.gradle | 15 ++++---- firebase-appdistribution-api/ktx/ktx.gradle | 8 ++-- .../firebase-appdistribution.gradle | 14 +++---- .../test-app/test-app.gradle | 4 +- ...firebase-dynamic-module-support.gradle.kts | 2 +- .../firebase-config-interop.gradle.kts | 4 +- firebase-config/firebase-config.gradle.kts | 2 +- firebase-config/ktx/ktx.gradle | 6 +-- .../firebase-crashlytics-ndk.gradle | 8 ++-- .../firebase-datatransport.gradle | 8 ++-- .../firebase-dynamic-links.gradle | 16 ++++---- firebase-dynamic-links/ktx/ktx.gradle | 6 +-- firebase-firestore/firebase-firestore.gradle | 38 +++++++++---------- firebase-firestore/ktx/ktx.gradle | 6 +-- .../firebase-functions.gradle.kts | 2 +- .../firebase-inappmessaging-display.gradle | 12 +++--- .../ktx/ktx.gradle | 6 +-- .../firebase-inappmessaging.gradle | 32 ++++++++-------- firebase-inappmessaging/ktx/ktx.gradle | 6 +-- .../firebase-installations.gradle | 16 ++++---- firebase-installations/ktx/ktx.gradle | 6 +-- firebase-messaging/firebase-messaging.gradle | 16 ++++---- firebase-messaging/ktx/ktx.gradle | 6 +-- .../firebase-ml-modeldownloader.gradle | 22 +++++------ firebase-ml-modeldownloader/ktx/ktx.gradle | 8 ++-- .../ml-data-collection-tests.gradle | 8 ++-- firebase-perf/dev-app/dev-app.gradle | 2 +- firebase-perf/e2e-app/e2e-app.gradle | 6 +-- firebase-perf/firebase-perf.gradle | 12 +++--- firebase-perf/ktx/ktx.gradle | 6 +-- firebase-storage/firebase-storage.gradle | 14 +++---- firebase-storage/ktx/ktx.gradle | 8 ++-- .../firebase-vertexai.gradle.kts | 1 - gradle/libs.versions.toml | 2 + .../template/app/build.gradle.mustache | 2 +- .../template/macrobenchmark/build.gradle | 2 +- smoke-tests/build.gradle | 6 +-- smoke-tests/settings.gradle | 8 ++++ transport/transport-api/transport-api.gradle | 2 +- .../transport-backend-cct.gradle | 6 +-- .../transport-runtime-testing.gradle | 6 +-- .../transport-runtime.gradle | 14 +++---- 56 files changed, 235 insertions(+), 240 deletions(-) diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle index 0c683da112c..dda6c064cb0 100644 --- a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle +++ b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle @@ -60,21 +60,21 @@ dependencies { api 'com.google.firebase:firebase-common-ktx:21.0.0' api 'com.google.firebase:firebase-components:18.0.0' - implementation "androidx.test:core:$androidxTestCoreVersion" + implementation libs.androidx.test.core implementation 'com.google.android.gms:play-services-base:18.0.1' implementation 'com.google.android.gms:play-services-tasks:18.0.1' testImplementation project(':appcheck:firebase-appcheck-playintegrity') - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.13-beta-2' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation project(':firebase-storage') androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.13-beta-2' androidTestImplementation 'org.mockito:mockito-core:2.25.0' } diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle index f17c8730c2f..6876a7456f3 100644 --- a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle +++ b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle @@ -63,10 +63,10 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:rules:1.2.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.13-beta-2' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle index 02b7415586a..81911068808 100644 --- a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle +++ b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle @@ -49,10 +49,10 @@ dependencies { implementation 'com.google.android.gms:play-services-base:18.0.1' implementation 'com.google.android.gms:play-services-tasks:18.0.1' - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:rules:1.2.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle index 277f33818fa..00c2b5d130a 100644 --- a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle +++ b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle @@ -64,9 +64,9 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation 'junit:junit:4.13.2' + testImplementation libs.androidx.test.core + testImplementation libs.truth + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:3.4.6' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle index 5db2e776e86..707607fe7d2 100644 --- a/appcheck/firebase-appcheck/firebase-appcheck.gradle +++ b/appcheck/firebase-appcheck/firebase-appcheck.gradle @@ -51,7 +51,7 @@ android { dependencies { javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6' - api 'com.google.android.gms:play-services-tasks:18.1.0' + api libs.playservices.tasks api 'com.google.firebase:firebase-annotations:16.2.0' api "com.google.firebase:firebase-appcheck-interop:17.1.0" api("com.google.firebase:firebase-common:21.0.0") @@ -59,21 +59,21 @@ dependencies { api("com.google.firebase:firebase-components:18.0.0") implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.google.android.gms:play-services-base:18.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.playservices.base + implementation libs.kotlin.stdlib testImplementation(project(":integ-testing")){ exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:rules:1.2.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13-beta-2' - testImplementation 'org.mockito:mockito-core:5.2.0' + testImplementation libs.mockito.core testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation project(':appcheck:firebase-appcheck') androidTestImplementation(project(":integ-testing")){ @@ -81,10 +81,10 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-components' } androidTestImplementation "androidx.annotation:annotation:1.0.0" - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.mockito:mockito-core:2.25.0' androidTestImplementation 'org.mockito:mockito-inline:2.25.0' diff --git a/appcheck/firebase-appcheck/ktx/ktx.gradle b/appcheck/firebase-appcheck/ktx/ktx.gradle index 0059ef3dd88..6ba439c38de 100644 --- a/appcheck/firebase-appcheck/ktx/ktx.gradle +++ b/appcheck/firebase-appcheck/ktx/ktx.gradle @@ -61,14 +61,14 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'com.google.firebase:firebase-appcheck-interop:17.1.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index abd655fb1da..b53d1461e8e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,6 @@ // limitations under the License. buildscript { - // TODO: remove once all sdks have migrated to version catalog - ext.kotlinVersion = libs.versions.kotlin.get() - ext.coroutinesVersion = libs.versions.coroutines.get() - repositories { google() mavenCentral() @@ -47,15 +43,6 @@ buildscript { apply from: 'sdkProperties.gradle' apply from: "gradle/errorProne.gradle" -ext { - // TODO: remove once all sdks have migrated to version catalog - googleTruthVersion = libs.versions.truth.get() - grpcVersion = libs.versions.grpc.get() - robolectricVersion = libs.versions.robolectric.get() - androidxTestCoreVersion = libs.versions.androidx.test.core.get() - androidxTestJUnitVersion = libs.versions.androidx.test.junit.get() -} - apply plugin: com.google.firebase.gradle.plugins.PublishingPlugin apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 37209e29bc5..8604f9447e5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation("com.google.auto.value:auto-value-annotations:1.8.1") annotationProcessor("com.google.auto.value:auto-value:1.6.5") implementation(kotlin("gradle-plugin", "1.8.22")) - implementation("org.json:json:20210307") + implementation(libs.org.json) implementation("org.eclipse.aether:aether-api:1.0.0.v20140518") implementation("org.eclipse.aether:aether-util:1.0.0.v20140518") @@ -63,8 +63,8 @@ dependencies { implementation(libs.android.gradlePlugin.builder.test.api) testImplementation(libs.bundles.kotest) - testImplementation("junit:junit:4.13.2") - testImplementation("com.google.truth:truth:1.4.2") + testImplementation(libs.junit) + testImplementation(libs.truth) testImplementation("commons-io:commons-io:2.15.1") } diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle index be7d242d9eb..25b724b24c8 100644 --- a/encoders/firebase-decoders-json/firebase-decoders-json.gradle +++ b/encoders/firebase-decoders-json/firebase-decoders-json.gradle @@ -49,11 +49,11 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' testImplementation 'androidx.test:runner:1.2.0' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.junit + testImplementation libs.truth testImplementation 'junit:junit:4.13-rc-1' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } tasks.withType(JavaCompile) { diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle index ae0f6433be7..1f16fa54f7c 100644 --- a/encoders/firebase-encoders-json/firebase-encoders-json.gradle +++ b/encoders/firebase-encoders-json/firebase-encoders-json.gradle @@ -55,11 +55,11 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' testImplementation 'androidx.test:runner:1.3.0' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + testImplementation libs.androidx.test.junit testImplementation "com.google.truth:truth:1.0.1" testImplementation 'junit:junit:4.13' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } tasks.withType(JavaCompile) { diff --git a/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle b/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle index 783074cad3e..37128813776 100644 --- a/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle +++ b/encoders/firebase-encoders-proto/firebase-encoders-proto.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation 'com.google.guava:guava:31.0-jre' testImplementation libs.protobuf.java.util - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0' testImplementation 'junit:junit:4.13.1' } diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle index e466efbeff8..8211062d668 100644 --- a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle +++ b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle @@ -52,9 +52,9 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' testImplementation 'androidx.test:runner:1.3.0' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + testImplementation libs.androidx.test.junit testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'junit:junit:4.13' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/encoders/firebase-encoders/firebase-encoders.gradle b/encoders/firebase-encoders/firebase-encoders.gradle index 9f7ab703c90..bba313b0e9a 100644 --- a/encoders/firebase-encoders/firebase-encoders.gradle +++ b/encoders/firebase-encoders/firebase-encoders.gradle @@ -33,7 +33,7 @@ java { dependencies { implementation 'androidx.annotation:annotation:1.1.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.13' } diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle index 906c072801f..4de0926e4b5 100644 --- a/firebase-abt/firebase-abt.gradle +++ b/firebase-abt/firebase-abt.gradle @@ -61,7 +61,7 @@ dependencies { exclude group: "com.google.firebase", module: "firebase-common" } - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") + implementation(libs.kotlin.stdlib.jdk8) testImplementation 'androidx.test:runner:1.2.0' testImplementation 'androidx.test.espresso:espresso-core:3.2.0' @@ -69,5 +69,5 @@ dependencies { testImplementation 'io.grpc:grpc-testing:1.12.0' testImplementation 'junit:junit:4.13-beta-2' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle index b57ee7c1796..9505c94fe94 100644 --- a/firebase-appdistribution-api/firebase-appdistribution-api.gradle +++ b/firebase-appdistribution-api/firebase-appdistribution-api.gradle @@ -58,24 +58,23 @@ dependencies { api("com.google.firebase:firebase-components:18.0.0") implementation 'androidx.annotation:annotation:1.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.kotlin.stdlib compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5' annotationProcessor 'com.google.auto.value:auto-value:1.6.5' testImplementation project(':firebase-appdistribution-api') - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation 'junit:junit:4.12' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.androidx.test.core + testImplementation libs.truth + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'org.mockito:mockito-inline:3.4.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' androidTestImplementation "org.mockito:mockito-android:3.4.0" } diff --git a/firebase-appdistribution-api/ktx/ktx.gradle b/firebase-appdistribution-api/ktx/ktx.gradle index f416bf99c1c..794b7b8b41a 100644 --- a/firebase-appdistribution-api/ktx/ktx.gradle +++ b/firebase-appdistribution-api/ktx/ktx.gradle @@ -62,13 +62,13 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' } diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle index a579961af1e..ec9776438a3 100644 --- a/firebase-appdistribution/firebase-appdistribution.gradle +++ b/firebase-appdistribution/firebase-appdistribution.gradle @@ -78,7 +78,7 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation 'com.google.android.gms:play-services-tasks:18.0.1' implementation libs.javax.inject - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") + implementation libs.kotlin.stdlib.jdk8 compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5' @@ -95,11 +95,11 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation 'junit:junit:4.13.2' + testImplementation libs.androidx.test.core + testImplementation libs.truth + testImplementation libs.junit testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation(project(":integ-testing")){ exclude group: 'com.google.firebase', module: 'firebase-common' @@ -107,8 +107,8 @@ dependencies { } androidTestImplementation "androidx.annotation:annotation:1.0.0" androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.mockito:mockito-core:2.25.0' androidTestImplementation 'org.mockito:mockito-inline:2.25.0' diff --git a/firebase-appdistribution/test-app/test-app.gradle b/firebase-appdistribution/test-app/test-app.gradle index 09a3fa0f450..420224b9e78 100644 --- a/firebase-appdistribution/test-app/test-app.gradle +++ b/firebase-appdistribution/test-app/test-app.gradle @@ -95,10 +95,10 @@ dependencies { // Shake detection implementation 'com.squareup:seismic:1.0.3' // Other dependencies - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.kotlin.stdlib // Beta flavor uses the full implementation betaImplementation project(':firebase-appdistribution') - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit } diff --git a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts index 307cb6e263d..b66ac2a7d81 100644 --- a/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts +++ b/firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts @@ -48,7 +48,7 @@ android { dependencies { implementation("com.google.android.play:feature-delivery:2.0.0") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") + implementation(libs.kotlin.stdlib.jdk8) api("com.google.firebase:firebase-common:21.0.0") api("com.google.firebase:firebase-components:18.0.0") } diff --git a/firebase-config-interop/firebase-config-interop.gradle.kts b/firebase-config-interop/firebase-config-interop.gradle.kts index 13f87b4c8c2..966a635f3a9 100644 --- a/firebase-config-interop/firebase-config-interop.gradle.kts +++ b/firebase-config-interop/firebase-config-interop.gradle.kts @@ -47,9 +47,9 @@ dependencies { api("com.google.firebase:firebase-encoders-json:18.0.1") api("com.google.firebase:firebase-encoders:17.0.0") - compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") + compileOnly(libs.autovalue.annotations) - annotationProcessor("com.google.auto.value:auto-value:1.10.1") + annotationProcessor(libs.autovalue) annotationProcessor(project(":encoders:firebase-encoders-processor")) testImplementation(libs.junit) diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts index 05f4651c73c..c2322d4232c 100644 --- a/firebase-config/firebase-config.gradle.kts +++ b/firebase-config/firebase-config.gradle.kts @@ -81,7 +81,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value:1.6.6") javadocClasspath("com.google.auto.value:auto-value-annotations:1.6.6") compileOnly("com.google.auto.value:auto-value-annotations:1.6.6") - compileOnly("com.google.code.findbugs:jsr305:3.0.2") + compileOnly(libs.findbugs.jsr305) // Testing testImplementation(libs.junit) diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle index 91c677fb6a9..dadf3933637 100644 --- a/firebase-config/ktx/ktx.gradle +++ b/firebase-config/ktx/ktx.gradle @@ -61,9 +61,9 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") implementation 'com.google.firebase:firebase-installations-interop:17.1.0' - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle index 4c0e8ebae3c..fa15c5c6c4e 100644 --- a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle +++ b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle @@ -115,14 +115,14 @@ dependencies { api "com.google.firebase:firebase-common-ktx:21.0.0" api "com.google.firebase:firebase-components:18.0.0" - implementation 'com.google.android.gms:play-services-basement:18.1.0' + implementation libs.playservices.basement testImplementation 'androidx.test:runner:1.4.0' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:3.4.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation libs.protobuf.java.lite androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1' diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle index 9185692a3c3..ce254540d4b 100644 --- a/firebase-datatransport/firebase-datatransport.gradle +++ b/firebase-datatransport/firebase-datatransport.gradle @@ -57,11 +57,11 @@ dependencies { implementation 'com.google.android.datatransport:transport-api:3.1.0' implementation 'com.google.android.datatransport:transport-backend-cct:3.2.0' implementation 'com.google.android.datatransport:transport-runtime:3.2.0' - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") + implementation(libs.kotlin.stdlib.jdk8) - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:runner:1.2.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle index 22344dc9ed7..401c0d2d6cc 100644 --- a/firebase-dynamic-links/firebase-dynamic-links.gradle +++ b/firebase-dynamic-links/firebase-dynamic-links.gradle @@ -61,7 +61,7 @@ android { dependencies { javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6' - javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2' + javadocClasspath libs.findbugs.jsr305 javadocClasspath 'org.checkerframework:checker-qual:2.5.2' api 'com.google.android.gms:play-services-tasks:18.0.1' @@ -76,13 +76,13 @@ dependencies { } implementation 'androidx.annotation:annotation:1.2.0' - implementation 'com.google.android.gms:play-services-base:18.0.1' - implementation 'com.google.android.gms:play-services-basement:18.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.playservices.base + implementation libs.playservices.basement + implementation libs.kotlin.stdlib testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3" - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'com.android.support.test:runner:1.0.2' testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2' testImplementation('com.google.android.gms:play-services-appinvite:18.0.0') { @@ -90,12 +90,12 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-dynamic-links' } testImplementation 'com.google.guava:guava-testlib:12.0-rc2' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3' } diff --git a/firebase-dynamic-links/ktx/ktx.gradle b/firebase-dynamic-links/ktx/ktx.gradle index a12f3acf88c..d286b9cb6a4 100644 --- a/firebase-dynamic-links/ktx/ktx.gradle +++ b/firebase-dynamic-links/ktx/ktx.gradle @@ -52,9 +52,9 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle index b99878c169f..ef3e339145d 100644 --- a/firebase-firestore/firebase-firestore.gradle +++ b/firebase-firestore/firebase-firestore.gradle @@ -40,7 +40,7 @@ protobuf { } plugins { grpc { - artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion" + artifact = libs.grpc.protoc.gen.java.get().toString() } } generateProtoTasks { @@ -135,17 +135,17 @@ dependencies { api('com.google.firebase:firebase-database-collection:18.0.1') implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.google.android.gms:play-services-base:18.0.1' - implementation 'com.google.android.gms:play-services-basement:18.1.0' - implementation "io.grpc:grpc-android:$grpcVersion" - implementation "io.grpc:grpc-okhttp:$grpcVersion" - implementation "io.grpc:grpc-protobuf-lite:$grpcVersion" - implementation "io.grpc:grpc-stub:$grpcVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" + implementation libs.playservices.base + implementation libs.playservices.basement + implementation libs.grpc.android + implementation libs.grpc.okhttp + implementation libs.grpc.protobuf.lite + implementation libs.grpc.stub + implementation libs.kotlin.stdlib + implementation libs.kotlinx.coroutines.core compileOnly 'com.google.auto.value:auto-value-annotations:1.6.6' - compileOnly 'javax.annotation:jsr250-api:1.0' + compileOnly libs.javax.annotation.jsr250 annotationProcessor 'com.google.auto.value:auto-value:1.6.5' @@ -153,28 +153,28 @@ dependencies { testImplementation project(':firebase-database-collection') testImplementation project(':firebase-firestore') - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8' testImplementation 'com.google.android.gms:play-services-tasks:18.0.1' testImplementation 'com.google.guava:guava-testlib:12.0-rc2' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0" testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric testCompileOnly libs.protobuf.java androidTestImplementation "androidx.annotation:annotation:1.1.0" - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + androidTestImplementation libs.androidx.test.rules + androidTestImplementation libs.androidx.test.runner + androidTestImplementation libs.androidx.test.junit androidTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8' - androidTestImplementation("com.google.truth:truth:$googleTruthVersion") { + androidTestImplementation(libs.truth) { exclude group: "org.codehaus.mojo", module: "animal-sniffer-annotations" } - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation libs.junit androidTestImplementation 'org.mockito:mockito-android:2.25.0' androidTestImplementation 'org.mockito:mockito-core:2.25.0' } diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle index e4cebe269f4..7129a16e4ef 100644 --- a/firebase-firestore/ktx/ktx.gradle +++ b/firebase-firestore/ktx/ktx.gradle @@ -63,13 +63,13 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") testImplementation project(':firebase-database-collection') - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8' testImplementation 'com.google.android.gms:play-services-tasks:18.0.1' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric testCompileOnly libs.protobuf.java } diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts index 15413e07eaa..8ec30bcc28b 100644 --- a/firebase-functions/firebase-functions.gradle.kts +++ b/firebase-functions/firebase-functions.gradle.kts @@ -132,5 +132,5 @@ dependencies { androidTestImplementation(libs.mockito.core) androidTestImplementation(libs.mockito.dexmaker) kapt("com.google.dagger:dagger-android-processor:2.43.2") - kapt("com.google.dagger:dagger-compiler:2.43.2") + kapt(libs.dagger.compiler) } diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle index 46ad38a4c54..5c9ae57e8a5 100644 --- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle +++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle @@ -101,25 +101,25 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.google.android.gms:play-services-tasks:18.0.1' implementation 'com.google.auto.value:auto-value-annotations:1.6.6' - implementation 'javax.inject:javax.inject:1' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.javax.inject + implementation libs.kotlin.stdlib annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' annotationProcessor 'com.google.auto.value:auto-value:1.6.5' annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6' annotationProcessor libs.dagger.compiler - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation ("com.google.firebase:firebase-analytics:17.0.0") { exclude group: "com.google.firebase", module: "firebase-common" } testImplementation 'com.google.guava:guava:30.1-android' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation "com.google.truth:truth:1.0" testImplementation "junit:junit:4.12" testImplementation 'junit:junit:4.12' testImplementation "org.mockito:mockito-core:2.25.0" - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation(project(":integ-testing")){ exclude group: 'com.google.firebase', module: 'firebase-common' @@ -129,7 +129,7 @@ dependencies { androidTestImplementation 'androidx.annotation:annotation:1.1.0' androidTestImplementation 'androidx.test:rules:1.2.0' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + androidTestImplementation libs.androidx.test.junit androidTestImplementation "com.google.dexmaker:dexmaker:1.2" androidTestImplementation ("com.google.firebase:firebase-analytics:17.4.0") { exclude group: "com.google.firebase", module: "firebase-common" diff --git a/firebase-inappmessaging-display/ktx/ktx.gradle b/firebase-inappmessaging-display/ktx/ktx.gradle index 1a72b53147e..12693bbce56 100644 --- a/firebase-inappmessaging-display/ktx/ktx.gradle +++ b/firebase-inappmessaging-display/ktx/ktx.gradle @@ -56,11 +56,11 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation ("com.google.firebase:firebase-analytics:17.0.0") { exclude group: "com.google.firebase", module: "firebase-common" } - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle index d79b57d29a3..2516a215ec4 100644 --- a/firebase-inappmessaging/firebase-inappmessaging.gradle +++ b/firebase-inappmessaging/firebase-inappmessaging.gradle @@ -36,7 +36,7 @@ protobuf { } plugins { grpc { - artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion" + artifact = libs.grpc.protoc.gen.java.get().toString() } } generateProtoTasks { @@ -133,15 +133,15 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' implementation 'com.google.android.datatransport:transport-api:3.0.0' implementation 'com.google.auto.value:auto-value-annotations:1.8.1' - implementation "io.grpc:grpc-okhttp:$grpcVersion" - implementation "io.grpc:grpc-protobuf-lite:$grpcVersion" - implementation "io.grpc:grpc-stub:$grpcVersion" + implementation libs.grpc.okhttp + implementation libs.grpc.protobuf.lite + implementation libs.grpc.stub implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxjava:2.1.14' - implementation 'javax.inject:javax.inject:1' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.javax.inject + implementation libs.kotlin.stdlib - compileOnly 'javax.annotation:jsr250-api:1.0' + compileOnly libs.javax.annotation.jsr250 annotationProcessor 'com.google.auto.value:auto-value:1.6.5' annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6' @@ -153,16 +153,16 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:runner:1.3.0' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + testImplementation libs.androidx.test.junit testImplementation 'com.google.guava:guava:30.1-android' - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation "io.grpc:grpc-testing:$grpcVersion" + testImplementation libs.truth + testImplementation libs.grpc.testing testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.1' - testImplementation 'org.mockito:mockito-core:5.2.0' - testImplementation ("org.robolectric:robolectric:$robolectricVersion") { + testImplementation libs.mockito.core + testImplementation (libs.robolectric) { exclude group: 'com.google.protobuf', module: 'protobuf-java' } @@ -172,11 +172,11 @@ dependencies { } androidTestImplementation "androidx.annotation:annotation:1.0.0" androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1' androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1' - androidTestImplementation "io.grpc:grpc-testing:$grpcVersion" + androidTestImplementation libs.grpc.testing androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.awaitility:awaitility:3.1.0' } diff --git a/firebase-inappmessaging/ktx/ktx.gradle b/firebase-inappmessaging/ktx/ktx.gradle index 4419c7023bd..0d40ad758cf 100644 --- a/firebase-inappmessaging/ktx/ktx.gradle +++ b/firebase-inappmessaging/ktx/ktx.gradle @@ -55,8 +55,8 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle index e236895b070..5dee4877a93 100644 --- a/firebase-installations/firebase-installations.gradle +++ b/firebase-installations/firebase-installations.gradle @@ -49,7 +49,7 @@ android { } dependencies { - javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2' + javadocClasspath libs.findbugs.jsr305 api 'com.google.android.gms:play-services-tasks:18.0.1' api 'com.google.firebase:firebase-annotations:16.2.0' @@ -59,7 +59,7 @@ dependencies { api 'com.google.firebase:firebase-installations-interop:17.1.0' api("com.google.firebase:firebase-installations-interop:17.1.1") - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.kotlin.stdlib compileOnly "com.google.auto.value:auto-value-annotations:1.6.5" @@ -69,13 +69,13 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13' - testImplementation 'org.mockito:mockito-core:5.2.0' + testImplementation libs.mockito.core testImplementation 'org.mockito:mockito-inline:5.2.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation(project(":integ-testing")){ exclude group: 'com.google.firebase', module: 'firebase-common' @@ -83,8 +83,8 @@ dependencies { } androidTestImplementation "androidx.annotation:annotation:1.0.0" androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.mockito:mockito-core:2.25.0' androidTestImplementation 'org.mockito:mockito-inline:2.25.0' diff --git a/firebase-installations/ktx/ktx.gradle b/firebase-installations/ktx/ktx.gradle index 06aae61e72a..c9c24d42af6 100644 --- a/firebase-installations/ktx/ktx.gradle +++ b/firebase-installations/ktx/ktx.gradle @@ -55,8 +55,8 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.13' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle index 39c9f51ba6e..349ff0f5bbd 100644 --- a/firebase-messaging/firebase-messaging.gradle +++ b/firebase-messaging/firebase-messaging.gradle @@ -114,14 +114,14 @@ dependencies { implementation 'com.google.android.gms:play-services-stats:17.0.2' implementation "com.google.android.gms:play-services-tasks:18.0.1" implementation "com.google.errorprone:error_prone_annotations:2.9.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.kotlin.stdlib annotationProcessor project(":encoders:firebase-encoders-processor") testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3" testImplementation 'androidx.core:core:1.6.0' - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:rules:1.2.0' testImplementation 'androidx.test:runner:1.2.0' testImplementation 'androidx.test.espresso:espresso-intents:3.2.0' @@ -141,11 +141,11 @@ dependencies { exclude group: "com.google.firebase", module: "firebase-installations" } testImplementation 'com.google.guava:guava-testlib:12.0-rc2' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13-beta-2' - testImplementation 'org.mockito:mockito-core:5.2.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.mockito.core + testImplementation libs.robolectric testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3' @@ -154,9 +154,9 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-components' } androidTestImplementation "androidx.annotation:annotation:1.0.0" androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'org.mockito:mockito-core:5.2.0' + androidTestImplementation libs.mockito.core androidTestImplementation 'org.mockito:mockito-inline:5.2.0' } diff --git a/firebase-messaging/ktx/ktx.gradle b/firebase-messaging/ktx/ktx.gradle index 3ecbfe5a996..8b506e8483f 100644 --- a/firebase-messaging/ktx/ktx.gradle +++ b/firebase-messaging/ktx/ktx.gradle @@ -54,8 +54,8 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle index 1f21ce6149f..b026a004dc8 100644 --- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle +++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle @@ -80,7 +80,7 @@ thirdPartyLicenses { } dependencies { - javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2' + javadocClasspath libs.findbugs.jsr305 vendor (libs.dagger.dagger) { exclude group: "javax.inject", module: "javax.inject" @@ -104,8 +104,8 @@ dependencies { implementation 'com.google.android.datatransport:transport-api:3.0.0' implementation 'com.google.android.datatransport:transport-runtime:3.1.8' implementation 'com.google.auto.service:auto-service-annotations:1.0.1' - implementation 'javax.inject:javax.inject:1' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.javax.inject + implementation libs.kotlin.stdlib compileOnly "com.google.auto.value:auto-value-annotations:1.6.6" @@ -117,22 +117,22 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:runner:1.5.1' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" + testImplementation libs.androidx.test.junit testImplementation 'com.github.tomakehurst:wiremock-standalone:2.26.3' testImplementation libs.protobuf.java.util - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0' testImplementation 'junit:junit:4.13-beta-2' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1' - testImplementation 'org.mockito:mockito-core:5.2.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.mockito.core + testImplementation libs.robolectric androidTestImplementation "androidx.annotation:annotation:1.1.0" androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.13.1' } diff --git a/firebase-ml-modeldownloader/ktx/ktx.gradle b/firebase-ml-modeldownloader/ktx/ktx.gradle index 9160e20be84..845a23a446f 100644 --- a/firebase-ml-modeldownloader/ktx/ktx.gradle +++ b/firebase-ml-modeldownloader/ktx/ktx.gradle @@ -52,9 +52,9 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") testImplementation 'androidx.test:runner:1.5.1' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation 'junit:junit:4.13.2' + testImplementation libs.androidx.test.junit + testImplementation libs.truth + testImplementation libs.junit testImplementation 'org.mockito:mockito-core:3.6.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle index b09deac0aad..4c3eea307bb 100644 --- a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle +++ b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle @@ -43,13 +43,13 @@ android { dependencies { implementation project(':firebase-ml-modeldownloader') - implementation 'androidx.core:core:1.2.0' + implementation libs.androidx.core implementation 'com.google.firebase:firebase-common:21.0.0' implementation 'com.google.firebase:firebase-common-ktx:21.0.0' testImplementation 'androidx.test:runner:1.2.0' - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.junit + testImplementation libs.truth testImplementation 'junit:junit:4.12' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric } diff --git a/firebase-perf/dev-app/dev-app.gradle b/firebase-perf/dev-app/dev-app.gradle index 7c0fa7907c6..41b7a98e48e 100644 --- a/firebase-perf/dev-app/dev-app.gradle +++ b/firebase-perf/dev-app/dev-app.gradle @@ -114,7 +114,7 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.12.0' // Integration Test Deps - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation libs.junit androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/firebase-perf/e2e-app/e2e-app.gradle b/firebase-perf/e2e-app/e2e-app.gradle index 55fd762a75f..6bdd3840de8 100644 --- a/firebase-perf/e2e-app/e2e-app.gradle +++ b/firebase-perf/e2e-app/e2e-app.gradle @@ -104,12 +104,12 @@ dependencies { // Integration Test Deps androidTestImplementation 'junit:junit:4.13.1' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "androidx.test:core:$androidxTestCoreVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.androidx.test.core androidTestImplementation 'androidx.test:rules:1.3.0' androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' androidTestImplementation "androidx.test.espresso:espresso-contrib:3.3.0" androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth } diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index 9735f1af260..c359a2d2041 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -105,7 +105,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-process:2.3.1" implementation "com.google.android.gms:play-services-tasks:18.0.1" implementation libs.protobuf.java.lite - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" + implementation libs.kotlin.stdlib implementation 'androidx.annotation:annotation:1.7.0' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.datatransport:transport-api:3.0.0' @@ -125,18 +125,18 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-components' } javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6' - javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2' + javadocClasspath libs.findbugs.jsr305 runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } testCompileOnly libs.protobuf.java - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth + testImplementation libs.robolectric testImplementation 'androidx.test:rules:1.2.0' testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:5.2.0' + testImplementation libs.mockito.core testImplementation 'org.mockito:mockito-inline:5.2.0' testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6' } diff --git a/firebase-perf/ktx/ktx.gradle b/firebase-perf/ktx/ktx.gradle index 4eada074307..5c4985bf147 100644 --- a/firebase-perf/ktx/ktx.gradle +++ b/firebase-perf/ktx/ktx.gradle @@ -53,11 +53,11 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric testCompileOnly libs.protobuf.java } diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle index 1121c0e1e53..ed69bea26d3 100644 --- a/firebase-storage/firebase-storage.gradle +++ b/firebase-storage/firebase-storage.gradle @@ -85,7 +85,7 @@ android { dependencies { javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6' - javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2' + javadocClasspath libs.findbugs.jsr305 api("com.google.firebase:firebase-annotations:16.2.0") api("com.google.firebase:firebase-appcheck:17.1.0") { @@ -106,20 +106,20 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' implementation 'com.google.android.gms:play-services-base:18.0.1' implementation 'com.google.android.gms:play-services-tasks:18.0.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" + implementation libs.kotlin.stdlib + implementation libs.kotlinx.coroutines.core - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'androidx.test:rules:1.2.0' - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation "androidx.annotation:annotation:1.1.0" androidTestImplementation 'androidx.test:rules:1.2.0' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' } diff --git a/firebase-storage/ktx/ktx.gradle b/firebase-storage/ktx/ktx.gradle index 7062741638b..bf6cda8adea 100644 --- a/firebase-storage/ktx/ktx.gradle +++ b/firebase-storage/ktx/ktx.gradle @@ -65,13 +65,13 @@ dependencies { implementation("com.google.firebase:firebase-components:18.0.0") - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.truth testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:3.3.3' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.12' } diff --git a/firebase-vertexai/firebase-vertexai.gradle.kts b/firebase-vertexai/firebase-vertexai.gradle.kts index c8cf9059167..773b41b9eb1 100644 --- a/firebase-vertexai/firebase-vertexai.gradle.kts +++ b/firebase-vertexai/firebase-vertexai.gradle.kts @@ -117,7 +117,6 @@ dependencies { testImplementation(libs.robolectric) testImplementation(libs.truth) - androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") androidTestImplementation(libs.androidx.test.junit) androidTestImplementation(libs.androidx.test.runner) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f2f013605fa..cf078e2c9ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,12 +48,14 @@ grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpc" } grpc-kotlin-stub = { module = "io.grpc:grpc-kotlin-stub", version.ref = "grpcKotlin" } grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "grpc" } grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" } +grpc-testing = { module= "io.grpc:grpc-testing", version.ref="grpc" } grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" } grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpcKotlin" } grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } javax-annotation-jsr250 = { module = "javax.annotation:jsr250-api", version = "1.0" } javax-inject = { module = "javax.inject:javax.inject", version = "1" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } +kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } diff --git a/health-metrics/benchmark/template/app/build.gradle.mustache b/health-metrics/benchmark/template/app/build.gradle.mustache index 98ca5f3cf15..3bc2a6f4339 100644 --- a/health-metrics/benchmark/template/app/build.gradle.mustache +++ b/health-metrics/benchmark/template/app/build.gradle.mustache @@ -70,7 +70,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.5.0' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation 'junit:junit:4.13.2' + testImplementation libs.junit androidTestImplementation "androidx.test.ext:junit:1.1.5" androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/health-metrics/benchmark/template/macrobenchmark/build.gradle b/health-metrics/benchmark/template/macrobenchmark/build.gradle index 36154f49bca..3aaa92441de 100644 --- a/health-metrics/benchmark/template/macrobenchmark/build.gradle +++ b/health-metrics/benchmark/template/macrobenchmark/build.gradle @@ -51,7 +51,7 @@ android { dependencies { implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0' implementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation "androidx.test.ext:junit:1.1.5" + implementation libs.androidx.test.junit implementation 'androidx.test.uiautomator:uiautomator:2.2.0' } diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle index 776164819e6..346bad8698f 100644 --- a/smoke-tests/build.gradle +++ b/smoke-tests/build.gradle @@ -64,7 +64,7 @@ android { apply from: "configure.gradle" dependencies { - implementation "androidx.test:core:1.5.0" + implementation libs.androidx.test.core // Common utilities (application side) implementation "androidx.test:rules:1.4.0" implementation "androidx.test:runner:1.4.0" @@ -90,11 +90,11 @@ dependencies { implementation "com.google.firebase:firebase-perf" implementation "com.google.firebase:firebase-storage" implementation "com.google.truth:truth:1.0.1" - implementation "junit:junit:4.13.2" + implementation libs.junit // Common utilities (instrumentation side) androidTestImplementation "androidx.test:runner:1.4.0" - androidTestImplementation "junit:junit:4.13.2" + androidTestImplementation libs.junit } clean.doLast { diff --git a/smoke-tests/settings.gradle b/smoke-tests/settings.gradle index a3cc1b04d31..f12471e93b7 100644 --- a/smoke-tests/settings.gradle +++ b/smoke-tests/settings.gradle @@ -11,3 +11,11 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/transport/transport-api/transport-api.gradle b/transport/transport-api/transport-api.gradle index 39fd06fe657..a805cad4c52 100644 --- a/transport/transport-api/transport-api.gradle +++ b/transport/transport-api/transport-api.gradle @@ -46,6 +46,6 @@ dependencies { annotationProcessor "com.google.auto.value:auto-value:1.6.5" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'junit:junit:4.13-beta-3' } diff --git a/transport/transport-backend-cct/transport-backend-cct.gradle b/transport/transport-backend-cct/transport-backend-cct.gradle index 0814bfd47e9..eb5d54ab073 100644 --- a/transport/transport-backend-cct/transport-backend-cct.gradle +++ b/transport/transport-backend-cct/transport-backend-cct.gradle @@ -69,13 +69,13 @@ dependencies { annotationProcessor project(':encoders:firebase-encoders-processor') annotationProcessor "com.google.auto.value:auto-value:1.6.5" - testImplementation "androidx.test:core:$androidxTestCoreVersion" + testImplementation libs.androidx.test.core testImplementation 'com.github.tomakehurst:wiremock:3.0.1' testImplementation libs.protobuf.java.util - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0' testImplementation 'junit:junit:4.13.1' - testImplementation "org.robolectric:robolectric:4.12" + testImplementation libs.robolectric androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/transport/transport-runtime-testing/transport-runtime-testing.gradle b/transport/transport-runtime-testing/transport-runtime-testing.gradle index 4dfced4aa5e..2268e8eea2a 100644 --- a/transport/transport-runtime-testing/transport-runtime-testing.gradle +++ b/transport/transport-runtime-testing/transport-runtime-testing.gradle @@ -42,7 +42,7 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth + androidTestImplementation libs.junit } diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle index c02b915e2ea..cf8e223a611 100644 --- a/transport/transport-runtime/transport-runtime.gradle +++ b/transport/transport-runtime/transport-runtime.gradle @@ -110,7 +110,7 @@ dependencies { api "com.google.firebase:firebase-encoders-proto:16.0.0" implementation 'androidx.annotation:annotation:1.3.0' - implementation 'javax.inject:javax.inject:1' + implementation libs.javax.inject compileOnly "com.google.auto.value:auto-value-annotations:1.6.6" compileOnly "com.google.errorprone:error_prone_annotations:2.9.0" @@ -121,17 +121,17 @@ dependencies { androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.27' - testImplementation "androidx.test:core:$androidxTestCoreVersion" - testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - testImplementation "com.google.truth:truth:$googleTruthVersion" + testImplementation libs.androidx.test.core + testImplementation libs.androidx.test.junit + testImplementation libs.truth testImplementation 'junit:junit:4.13-beta-2' testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation "org.robolectric:robolectric:$robolectricVersion" + testImplementation libs.robolectric androidTestImplementation 'androidx.test:rules:1.2.0' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion" - androidTestImplementation "com.google.truth:truth:$googleTruthVersion" + androidTestImplementation libs.androidx.test.junit + androidTestImplementation libs.truth androidTestImplementation 'junit:junit:4.13-beta-3' androidTestImplementation 'org.mockito:mockito-android:2.25.0' androidTestImplementation 'org.mockito:mockito-core:2.25.0'