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 d2134379e3f..1f09923da89 100644 --- a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle +++ b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle @@ -54,8 +54,8 @@ dependencies { api project(':appcheck:firebase-appcheck') api project(':appcheck:firebase-appcheck-debug') api 'com.google.firebase:firebase-appcheck-interop:17.0.0' - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.common + api libs.firebase.components implementation libs.androidx.test.core implementation libs.playservices.base diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle index 3e162a0b5f1..ad1dddda818 100644 --- a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle +++ b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle @@ -49,9 +49,9 @@ dependencies { javadocClasspath libs.autovalue.annotations api project(':appcheck:firebase-appcheck') - api 'com.google.firebase:firebase-annotations:17.0.0' - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.annotations + api libs.firebase.common + api libs.firebase.components implementation platform(libs.kotlin.bom) implementation libs.playservices.base diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle index 3090a65060e..4a8cbbb9dfb 100644 --- a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle +++ b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle @@ -49,9 +49,9 @@ dependencies { javadocClasspath libs.autovalue.annotations api project(':appcheck:firebase-appcheck') - api 'com.google.firebase:firebase-annotations:17.0.0' - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.annotations + api libs.firebase.common + api libs.firebase.components implementation libs.playservices.base implementation libs.playservices.tasks diff --git a/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle b/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle index 0a9c95c31c7..b8a8f2b93a5 100644 --- a/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle +++ b/appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle @@ -49,8 +49,8 @@ dependencies { implementation(libs.dagger.dagger) api project(':appcheck:firebase-appcheck') - api 'com.google.firebase:firebase-common' - api 'com.google.firebase:firebase-components' + api libs.firebase.common + api libs.firebase.components api 'com.google.android.recaptcha:recaptcha:18.7.1' annotationProcessor(libs.dagger.compiler) diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle index 50e901f1713..59dea8cc1fb 100644 --- a/appcheck/firebase-appcheck/firebase-appcheck.gradle +++ b/appcheck/firebase-appcheck/firebase-appcheck.gradle @@ -51,10 +51,10 @@ dependencies { javadocClasspath libs.autovalue.annotations api libs.playservices.tasks - api 'com.google.firebase:firebase-annotations:17.0.0' + api libs.firebase.annotations api "com.google.firebase:firebase-appcheck-interop:17.1.0" - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) implementation libs.androidx.annotation implementation libs.playservices.base diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle index 3bd769072e2..3d63dfb2cb2 100644 --- a/firebase-abt/firebase-abt.gradle +++ b/firebase-abt/firebase-abt.gradle @@ -51,8 +51,8 @@ android { } dependencies { - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.common + api libs.firebase.components implementation libs.playservices.basement implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') { diff --git a/firebase-ai/CHANGELOG.md b/firebase-ai/CHANGELOG.md index 89a673b010c..1fcecd778dc 100644 --- a/firebase-ai/CHANGELOG.md +++ b/firebase-ai/CHANGELOG.md @@ -22,13 +22,11 @@ * [changed] Added a `dilation` parameter to `ImagenMaskReference.generateMaskAndPadForOutpainting` (#7260) -* [feature] Added support for limited-use tokens with Firebase App Check. - These limited-use tokens are required for an upcoming optional feature called - _replay protection_. We recommend +* [feature] Added support for limited-use tokens with Firebase App Check. These limited-use tokens + are required for an upcoming optional feature called _replay protection_. We recommend [enabling the usage of limited-use tokens](https://firebase.google.com/docs/ai-logic/app-check) - now so that when replay protection becomes available, you can enable it sooner - because more of your users will be on versions of your app that send limited-use tokens. - (#7285) + now so that when replay protection becomes available, you can enable it sooner because more of + your users will be on versions of your app that send limited-use tokens. (#7285) # 17.1.0 diff --git a/firebase-ai/firebase-ai.gradle.kts b/firebase-ai/firebase-ai.gradle.kts index 26bb6c76a66..9d85562bee2 100644 --- a/firebase-ai/firebase-ai.gradle.kts +++ b/firebase-ai/firebase-ai.gradle.kts @@ -95,9 +95,9 @@ dependencies { implementation(libs.ktor.serialization.kotlinx.json) implementation(libs.ktor.client.logging) - api("com.google.firebase:firebase-common:22.0.0") - implementation("com.google.firebase:firebase-components:19.0.0") - implementation("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.common) + implementation(libs.firebase.components) + implementation(libs.firebase.annotations) implementation("com.google.firebase:firebase-appcheck-interop:17.1.0") implementation(libs.androidx.annotation) implementation(libs.kotlinx.serialization.json) diff --git a/firebase-annotations/firebase-annotations.gradle.kts b/firebase-annotations/firebase-annotations.gradle.kts index df2fa9b290f..fd78203e0f5 100644 --- a/firebase-annotations/firebase-annotations.gradle.kts +++ b/firebase-annotations/firebase-annotations.gradle.kts @@ -24,6 +24,6 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -tasks.withType { options.compilerArgs.add("-Werror") } +tasks.withType { options.compilerArgs.addAll(listOf("-Werror", "-Xlint:-options")) } dependencies { implementation(libs.javax.inject) } diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle index 70ba4c12efc..e1d5b47b9de 100644 --- a/firebase-appdistribution-api/firebase-appdistribution-api.gradle +++ b/firebase-appdistribution-api/firebase-appdistribution-api.gradle @@ -53,8 +53,8 @@ android { dependencies { api libs.playservices.tasks - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) implementation libs.androidx.annotation implementation libs.kotlin.stdlib diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle index 9c78f05c954..c95dca48d45 100644 --- a/firebase-appdistribution/firebase-appdistribution.gradle +++ b/firebase-appdistribution/firebase-appdistribution.gradle @@ -65,8 +65,8 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.common + api libs.firebase.components api('com.google.firebase:firebase-installations-interop:17.1.0') { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts index 9f59e2da14f..b84eb30f426 100644 --- a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts +++ b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts @@ -35,7 +35,7 @@ android { dependencies { implementation("com.google.firebase:firebase-common:22.0.0") - implementation("com.google.firebase:firebase-components:19.0.0") + implementation(libs.firebase.components) implementation(platform(libs.kotlin.bom)) testImplementation(libs.androidx.core) diff --git a/firebase-common/firebase-common.gradle.kts b/firebase-common/firebase-common.gradle.kts index 4cce2c66186..8d3a6998e56 100644 --- a/firebase-common/firebase-common.gradle.kts +++ b/firebase-common/firebase-common.gradle.kts @@ -55,8 +55,8 @@ android { dependencies { api(libs.kotlin.coroutines.tasks) - api("com.google.firebase:firebase-components:19.0.0") - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.components) + api(libs.firebase.annotations) implementation(libs.androidx.datastore.preferences) implementation(libs.androidx.annotation) implementation(libs.androidx.futures) diff --git a/firebase-components/firebase-components.gradle.kts b/firebase-components/firebase-components.gradle.kts index 6913857141f..14ff598165f 100644 --- a/firebase-components/firebase-components.gradle.kts +++ b/firebase-components/firebase-components.gradle.kts @@ -44,7 +44,7 @@ android { } dependencies { - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.annotations) implementation(libs.androidx.annotation) implementation(libs.errorprone.annotations) diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle index a24d327d1b9..50468145902 100644 --- a/firebase-config/bandwagoner/bandwagoner.gradle +++ b/firebase-config/bandwagoner/bandwagoner.gradle @@ -93,7 +93,7 @@ dependencies { // Released artifacts don't need these dependencies since they don't use `project` to refer // to Remote Config. implementation("com.google.firebase:firebase-common:22.0.0") - implementation("com.google.firebase:firebase-components:19.0.0") + implementation(libs.firebase.components) implementation("com.google.firebase:firebase-installations-interop:17.1.1") { 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 d1dffa70c23..be3db972b63 100644 --- a/firebase-config/firebase-config.gradle.kts +++ b/firebase-config/firebase-config.gradle.kts @@ -61,7 +61,7 @@ android { dependencies { // Firebase api("com.google.firebase:firebase-config-interop:16.0.1") - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.annotations) api("com.google.firebase:firebase-installations-interop:17.1.0") api("com.google.firebase:firebase-abt:21.1.1") { exclude(group = "com.google.firebase", module = "firebase-common") @@ -71,8 +71,8 @@ dependencies { exclude(group = "com.google.firebase", module = "firebase-common") exclude(group = "com.google.firebase", module = "firebase-components") } - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api("com.google.firebase:firebase-installations:18.0.0") { exclude(group = "com.google.firebase", module = "firebase-common-ktx") } diff --git a/firebase-config/test-app/test-app.gradle.kts b/firebase-config/test-app/test-app.gradle.kts index b3cfd04ffb8..ba91b7be5ec 100644 --- a/firebase-config/test-app/test-app.gradle.kts +++ b/firebase-config/test-app/test-app.gradle.kts @@ -62,7 +62,7 @@ dependencies { // Released artifacts don't need these dependencies since they don't use `project` to refer // to Remote Config. implementation("com.google.firebase:firebase-common:22.0.0") - implementation("com.google.firebase:firebase-components:19.0.0") + implementation(libs.firebase.components) implementation("com.google.firebase:firebase-installations-interop:17.1.0") runtimeOnly("com.google.firebase:firebase-installations:18.0.0") { diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle index 62b4c591693..fc70ac5e6ad 100644 --- a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle +++ b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle @@ -110,8 +110,8 @@ thirdPartyLicenses { dependencies { api project(':firebase-crashlytics') - api "com.google.firebase:firebase-common:22.0.0" - api "com.google.firebase:firebase-components:19.0.0" + api libs.firebase.common + api libs.firebase.components implementation libs.playservices.basement diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle index 9a834fff4b0..aa481022283 100644 --- a/firebase-crashlytics/firebase-crashlytics.gradle +++ b/firebase-crashlytics/firebase-crashlytics.gradle @@ -70,9 +70,9 @@ dependencies { api(project(":firebase-sessions")) api(libs.playservices.tasks) - api("com.google.firebase:firebase-annotations:17.0.0") - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.annotations) + api(libs.firebase.common) + api(libs.firebase.components) 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") diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts index 92e0a67ff5a..c9ba57d2aea 100644 --- a/firebase-database/firebase-database.gradle.kts +++ b/firebase-database/firebase-database.gradle.kts @@ -66,8 +66,8 @@ android { dependencies { api("com.google.firebase:firebase-appcheck-interop:17.1.0") - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api("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") diff --git a/firebase-dataconnect/firebase-dataconnect.gradle.kts b/firebase-dataconnect/firebase-dataconnect.gradle.kts index afc2c2ec6f7..2840a9c2e36 100644 --- a/firebase-dataconnect/firebase-dataconnect.gradle.kts +++ b/firebase-dataconnect/firebase-dataconnect.gradle.kts @@ -100,12 +100,12 @@ protobuf { } dependencies { - api("com.google.firebase:firebase-common:22.0.0") + api(libs.firebase.common) - implementation("com.google.firebase:firebase-annotations:17.0.0") + implementation(libs.firebase.annotations) 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-components:19.0.0") + implementation(libs.firebase.components) compileOnly(libs.javax.annotation.jsr250) compileOnly(libs.kotlinx.datetime) diff --git a/firebase-dataconnect/testutil/testutil.gradle.kts b/firebase-dataconnect/testutil/testutil.gradle.kts index 10313cd277a..c85b15040fd 100644 --- a/firebase-dataconnect/testutil/testutil.gradle.kts +++ b/firebase-dataconnect/testutil/testutil.gradle.kts @@ -60,7 +60,7 @@ kotlin { dependencies { implementation(project(":firebase-dataconnect")) - implementation("com.google.firebase:firebase-components:19.0.0") + implementation(libs.firebase.components) implementation("com.google.firebase:firebase-auth:22.3.1") compileOnly(libs.kotlinx.datetime) diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle index 0a9c6dc3b34..e9843e4e6b5 100644 --- a/firebase-datatransport/firebase-datatransport.gradle +++ b/firebase-datatransport/firebase-datatransport.gradle @@ -49,8 +49,8 @@ android { } dependencies { - api 'com.google.firebase:firebase-common:22.0.0' - api 'com.google.firebase:firebase-components:19.0.0' + api libs.firebase.common + api libs.firebase.components implementation libs.androidx.annotation implementation 'com.google.android.datatransport:transport-api:3.1.0' diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle index 56cb6e8bd4a..46ee296fbd0 100644 --- a/firebase-dynamic-links/firebase-dynamic-links.gradle +++ b/firebase-dynamic-links/firebase-dynamic-links.gradle @@ -67,8 +67,8 @@ dependencies { api('com.google.firebase:firebase-auth-interop:20.0.0') { exclude group: "com.google.firebase", module: "firebase-common" } - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api('com.google.firebase:firebase-measurement-connector:19.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' } diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle index 630a8f5605b..f5c515eeccd 100644 --- a/firebase-firestore/firebase-firestore.gradle +++ b/firebase-firestore/firebase-firestore.gradle @@ -122,14 +122,14 @@ dependencies { api project(':protolite-well-known-types') api libs.playservices.tasks - api 'com.google.firebase:firebase-annotations:17.0.0' + api libs.firebase.annotations api 'com.google.firebase:firebase-appcheck-interop:17.0.0' api('com.google.firebase:firebase-auth-interop:19.0.2') { exclude group: "com.google.firebase", module: "firebase-common" } - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api('com.google.firebase:firebase-database-collection:18.0.1') implementation libs.androidx.annotation diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts index 5f754f6ef7b..1f557357a62 100644 --- a/firebase-functions/firebase-functions.gradle.kts +++ b/firebase-functions/firebase-functions.gradle.kts @@ -77,9 +77,9 @@ dependencies { javadocClasspath(libs.findbugs.jsr305) api("com.google.firebase:firebase-appcheck-interop:17.1.0") - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.common) + api(libs.firebase.components) + api(libs.firebase.annotations) api("com.google.firebase:firebase-auth-interop:18.0.0") { exclude(group = "com.google.firebase", module = "firebase-common") } diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle index a79e1289e9a..bd1d59f180d 100644 --- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle +++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle @@ -88,8 +88,8 @@ dependencies { } api(project(":firebase-inappmessaging")) - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) implementation libs.androidx.annotation implementation libs.androidx.appcompat diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle index 1a711fc1b7d..694adf51267 100644 --- a/firebase-inappmessaging/firebase-inappmessaging.gradle +++ b/firebase-inappmessaging/firebase-inappmessaging.gradle @@ -117,8 +117,8 @@ dependencies { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' } - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api("com.google.firebase:firebase-datatransport:18.2.0"){ exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' diff --git a/firebase-installations-interop/firebase-installations-interop.gradle b/firebase-installations-interop/firebase-installations-interop.gradle index 9bfda5ef3bb..244d28f87d2 100644 --- a/firebase-installations-interop/firebase-installations-interop.gradle +++ b/firebase-installations-interop/firebase-installations-interop.gradle @@ -45,7 +45,7 @@ android { } dependencies { - api 'com.google.firebase:firebase-annotations:17.0.0' + api libs.firebase.annotations implementation libs.playservices.tasks diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle index 15f9fab07fe..2650b53726c 100644 --- a/firebase-installations/firebase-installations.gradle +++ b/firebase-installations/firebase-installations.gradle @@ -52,9 +52,9 @@ dependencies { javadocClasspath libs.findbugs.jsr305 api libs.playservices.tasks - api 'com.google.firebase:firebase-annotations:17.0.0' - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api libs.firebase.annotations + api(libs.firebase.common) + api(libs.firebase.components) api("com.google.firebase:firebase-installations-interop:17.1.1") implementation libs.kotlin.stdlib diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle index ca4c98010bf..54cc977e08a 100644 --- a/firebase-messaging/firebase-messaging.gradle +++ b/firebase-messaging/firebase-messaging.gradle @@ -89,8 +89,8 @@ android { dependencies { javadocClasspath libs.autovalue.annotations - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api('com.google.firebase:firebase-datatransport:18.2.0') { exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle index 8ed98f01116..74504480a19 100644 --- a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle +++ b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle @@ -87,9 +87,9 @@ dependencies { } api libs.playservices.tasks - api 'com.google.firebase:firebase-annotations:17.0.0' - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api libs.firebase.annotations + api(libs.firebase.common) + api(libs.firebase.components) api('com.google.firebase:firebase-datatransport:18.2.0'){ exclude group: 'com.google.firebase', module: 'firebase-common' exclude group: 'com.google.firebase', module: 'firebase-components' diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle index 54a8a232c71..b6a678bfc5c 100644 --- a/firebase-perf/firebase-perf.gradle +++ b/firebase-perf/firebase-perf.gradle @@ -109,12 +109,12 @@ dependencies { implementation libs.androidx.appcompat implementation 'com.google.android.datatransport:transport-api:3.0.0' implementation libs.dagger.dagger - api 'com.google.firebase:firebase-annotations:17.0.0' + api libs.firebase.annotations api 'com.google.firebase:firebase-installations-interop:17.1.0' api project(":protolite-well-known-types") implementation libs.okhttp - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) api("com.google.firebase:firebase-config:21.5.0") { 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 d739da82f33..745bb0775f6 100644 --- a/firebase-sessions/firebase-sessions.gradle.kts +++ b/firebase-sessions/firebase-sessions.gradle.kts @@ -65,15 +65,15 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class.java). } dependencies { - api("com.google.firebase:firebase-common:22.0.0") + api(libs.firebase.common) - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.components) api("com.google.firebase:firebase-installations-interop:17.2.0") { exclude(group = "com.google.firebase", module = "firebase-common") exclude(group = "com.google.firebase", module = "firebase-components") } - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.annotations) api("com.google.firebase:firebase-encoders:17.0.0") api("com.google.firebase:firebase-encoders-json:18.0.1") diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle index 7f0552c3c05..cf8fa5169d0 100644 --- a/firebase-storage/firebase-storage.gradle +++ b/firebase-storage/firebase-storage.gradle @@ -86,7 +86,7 @@ dependencies { javadocClasspath libs.autovalue.annotations javadocClasspath libs.findbugs.jsr305 - api("com.google.firebase:firebase-annotations:17.0.0") + api(libs.firebase.annotations) 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" @@ -99,8 +99,8 @@ dependencies { exclude group: "com.google.firebase", module: "firebase-components" exclude group: "com.google.firebase", module: "firebase-annotations" } - api("com.google.firebase:firebase-common:22.0.0") - api("com.google.firebase:firebase-components:19.0.0") + api(libs.firebase.common) + api(libs.firebase.components) implementation libs.androidx.annotation implementation libs.playservices.base diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 71f3274a973..5399caf85bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ dexmakerVersion = "1.2" espressoCore = "3.6.1" featureDelivery = "2.1.0" firebaseAppdistributionGradle = "5.1.1" +firebaseAnnotations = "17.0.0" firebaseCommon = "22.0.0" firebaseComponents = "19.0.0" firebaseCrashlyticsGradle = "3.0.4" @@ -116,6 +117,7 @@ errorprone-annotations = { module = "com.google.errorprone:error_prone_annotatio feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "featureDelivery" } findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } firebase-appdistribution-gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppdistributionGradle" } +firebase-annotations = { module = "com.google.firebase:firebase-annotations", version.ref = "firebaseAnnotations" } firebase-common = { module = "com.google.firebase:firebase-common", version.ref = "firebaseCommon" } firebase-components = { module = "com.google.firebase:firebase-components", version.ref = "firebaseComponents" } glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } @@ -222,13 +224,13 @@ wiremock-standalone = { module = "com.github.tomakehurst:wiremock-standalone", v kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"] playservices = ["playservices-base", "playservices-basement", "playservices-tasks"] maven-resolver = [ - "maven-resolver-api", - "maven-resolver-connector-basic", - "maven-resolver-impl", - "maven-resolver-provider", - "maven-resolver-transport-file", - "maven-resolver-transport-http", - "maven-resolver-util" + "maven-resolver-api", + "maven-resolver-connector-basic", + "maven-resolver-impl", + "maven-resolver-provider", + "maven-resolver-transport-file", + "maven-resolver-transport-http", + "maven-resolver-util" ] [plugins]