Skip to content

Commit 2b072d9

Browse files
authored
Move all SDKs dependencies to use the version catalog (#6584)
The only dependencies not moved are the ones against other Firebase libraries. These will be updated during releases.
1 parent f93c0a0 commit 2b072d9

File tree

29 files changed

+325
-247
lines changed

29 files changed

+325
-247
lines changed

firebase-abt/firebase-abt.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ dependencies {
5555
api 'com.google.firebase:firebase-common:21.0.0'
5656
api 'com.google.firebase:firebase-components:18.0.0'
5757

58-
implementation 'com.google.android.gms:play-services-basement:18.1.0'
58+
implementation libs.playservices.basement
5959
implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
6060
exclude group: "com.google.firebase", module: "firebase-common"
6161
}
6262

6363
implementation(libs.kotlin.stdlib.jdk8)
6464

65-
testImplementation 'androidx.test:runner:1.2.0'
66-
testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
67-
testImplementation 'com.google.truth:truth:0.44'
68-
testImplementation 'io.grpc:grpc-testing:1.12.0'
69-
testImplementation 'junit:junit:4.13-beta-2'
70-
testImplementation 'org.mockito:mockito-core:2.25.0'
65+
testImplementation libs.androidx.test.runner
66+
testImplementation libs.androidx.espresso.core
67+
testImplementation libs.truth
68+
testImplementation libs.grpc.testing
69+
testImplementation libs.junit
70+
testImplementation libs.mockito.core
7171
testImplementation libs.robolectric
7272
}

firebase-appdistribution-api/firebase-appdistribution-api.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ android {
5252
}
5353

5454
dependencies {
55-
api 'com.google.android.gms:play-services-tasks:18.0.1'
55+
api libs.playservices.tasks
5656
api("com.google.firebase:firebase-common:21.0.0")
5757
api("com.google.firebase:firebase-common-ktx:21.0.0")
5858
api("com.google.firebase:firebase-components:18.0.0")
5959

60-
implementation 'androidx.annotation:annotation:1.1.0'
60+
implementation libs.androidx.annotation
6161
implementation libs.kotlin.stdlib
6262

63-
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
63+
compileOnly libs.autovalue.annotations
6464

65-
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
65+
annotationProcessor libs.autovalue
6666

6767
testImplementation project(':firebase-appdistribution-api')
6868
testImplementation libs.androidx.test.core
6969
testImplementation libs.truth
7070
testImplementation libs.junit
71-
testImplementation 'org.mockito:mockito-core:2.25.0'
72-
testImplementation 'org.mockito:mockito-inline:3.4.0'
71+
testImplementation libs.mockito.core
72+
testImplementation libs.mockito.mockito.inline
7373
testImplementation libs.robolectric
7474

7575
androidTestImplementation libs.androidx.test.core
76-
androidTestImplementation 'androidx.test:runner:1.2.0'
76+
androidTestImplementation libs.androidx.test.runner
7777
androidTestImplementation libs.truth
78-
androidTestImplementation 'junit:junit:4.12'
79-
androidTestImplementation "org.mockito:mockito-android:3.4.0"
78+
androidTestImplementation libs.junit
79+
androidTestImplementation libs.mockito.android
8080
}

firebase-appdistribution/firebase-appdistribution.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ dependencies {
7373
exclude group: 'com.google.firebase', module: 'firebase-components'
7474
}
7575

76-
implementation 'androidx.appcompat:appcompat:1.3.1'
77-
implementation "androidx.browser:browser:1.3.0"
78-
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
79-
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
76+
implementation libs.androidx.appcompat
77+
implementation libs.androidx.browser
78+
implementation libs.androidx.constraintlayout
79+
implementation libs.playservices.tasks
8080
implementation libs.javax.inject
8181
implementation libs.kotlin.stdlib.jdk8
8282

83-
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
83+
compileOnly libs.autovalue.annotations
8484

8585
runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
8686
exclude group: 'com.google.firebase', module: 'firebase-common'
@@ -98,18 +98,18 @@ dependencies {
9898
testImplementation libs.androidx.test.core
9999
testImplementation libs.truth
100100
testImplementation libs.junit
101-
testImplementation 'org.mockito:mockito-inline:5.2.0'
101+
testImplementation libs.mockito.mockito.inline
102102
testImplementation libs.robolectric
103103

104104
androidTestImplementation(project(":integ-testing")){
105105
exclude group: 'com.google.firebase', module: 'firebase-common'
106106
exclude group: 'com.google.firebase', module: 'firebase-components'
107107
}
108-
androidTestImplementation "androidx.annotation:annotation:1.0.0"
109-
androidTestImplementation 'androidx.test:runner:1.2.0'
108+
androidTestImplementation libs.androidx.annotation
109+
androidTestImplementation libs.androidx.test.runner
110110
androidTestImplementation libs.androidx.test.junit
111111
androidTestImplementation libs.truth
112-
androidTestImplementation 'junit:junit:4.12'
113-
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
114-
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
112+
androidTestImplementation libs.junit
113+
androidTestImplementation libs.mockito.core
114+
androidTestImplementation libs.mockito.mockito.inline
115115
}

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static com.google.firebase.appdistribution.impl.FirebaseAppDistributionNotificationsManager.NotificationType.FEEDBACK;
1919
import static java.util.concurrent.TimeUnit.SECONDS;
2020

21+
import android.annotation.SuppressLint;
2122
import android.app.Activity;
2223
import android.app.Notification;
2324
import android.app.NotificationChannel;
@@ -97,6 +98,9 @@ enum NotificationType {
9798
this.uiThreadExecutor = uiThreadExecutor;
9899
}
99100

101+
// Suppress lint as `areNotificationsEnabled()` verifies whether the notification can be send,
102+
// including API 33+. Developers are expected to ask for notification permissions themselves.
103+
@SuppressLint("MissingPermission")
100104
void showAppUpdateNotification(long totalBytes, long downloadedBytes, int stringResourceId) {
101105
// Create the NotificationChannel, but only on API 26+ because
102106
// the NotificationChannel class is new and not in the support library
@@ -179,7 +183,8 @@ public void showFeedbackNotification(
179183
});
180184
}
181185

182-
// this must be run on the main (UI) thread
186+
// This must be run on the main (UI) thread.
187+
@SuppressLint("MissingPermission")
183188
private void doShowFeedbackNotification() {
184189
LogWrapper.i(TAG, "Showing feedback notification");
185190
notificationManager.notify(FEEDBACK.tag, FEEDBACK.id, feedbackNotificationToBeShown);

firebase-config/bandwagoner/bandwagoner.gradle

+15-15
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ firebaseTestLab {
6868
}
6969

7070
dependencies {
71-
api 'com.google.auto.value:auto-value-annotations:1.6.5'
71+
api libs.autovalue.annotations
7272

7373
// Depend on development artifacts for Remote Config.
7474
implementation(project(":firebase-config")) {
@@ -83,14 +83,14 @@ dependencies {
8383
exclude group: 'com.google.firebase', module: 'firebase-common'
8484
exclude group: 'com.google.firebase', module: 'firebase-components'
8585
}
86-
implementation 'androidx.annotation:annotation:1.1.0'
87-
implementation 'androidx.appcompat:appcompat:1.0.2'
88-
implementation 'androidx.core:core:1.0.2'
89-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
90-
implementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
91-
implementation 'com.google.android.gms:play-services-basement:18.1.0'
92-
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
93-
implementation 'com.google.android.material:material:1.0.0'
86+
implementation libs.androidx.annotation
87+
implementation libs.androidx.appcompat
88+
implementation libs.androidx.core
89+
implementation libs.androidx.legacy.support.v4
90+
implementation libs.androidx.espresso.idling.resource
91+
implementation libs.playservices.basement
92+
implementation libs.playservices.tasks
93+
implementation libs.material
9494
// This is required since a `project` dependency on frc does not expose the APIs of its
9595
// "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
9696
// Released artifacts don't need these dependencies since they don't use `project` to refer
@@ -104,12 +104,12 @@ dependencies {
104104
}
105105
// Support Libraries
106106
implementation 'com.google.guava:guava:28.1-android'
107-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4"
107+
implementation libs.kotlinx.coroutines.core
108108

109-
annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
109+
annotationProcessor libs.autovalue
110110

111-
androidTestImplementation 'androidx.test:rules:1.2.0'
112-
androidTestImplementation 'androidx.test:runner:1.2.0'
113-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
114-
androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
111+
androidTestImplementation libs.androidx.test.rules
112+
androidTestImplementation libs.androidx.test.runner
113+
androidTestImplementation libs.androidx.espresso.core
114+
androidTestImplementation libs.androidx.espresso.idling.resource
115115
}

firebase-config/firebase-config.gradle.kts

+9-9
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ dependencies {
7878

7979
// Kotlin & Android
8080
implementation(libs.kotlin.stdlib)
81-
implementation("androidx.annotation:annotation:1.1.0")
82-
api("com.google.android.gms:play-services-tasks:18.0.1")
81+
implementation(libs.androidx.annotation)
82+
api(libs.playservices.tasks)
8383

8484
// Annotations and static analysis
85-
annotationProcessor("com.google.auto.value:auto-value:1.6.6")
86-
javadocClasspath("com.google.auto.value:auto-value-annotations:1.6.6")
87-
compileOnly("com.google.auto.value:auto-value-annotations:1.6.6")
85+
annotationProcessor(libs.autovalue)
86+
javadocClasspath(libs.autovalue.annotations)
87+
compileOnly(libs.autovalue.annotations)
8888
compileOnly(libs.findbugs.jsr305)
8989

9090
// Testing
@@ -95,13 +95,13 @@ dependencies {
9595
testImplementation(libs.robolectric)
9696
testImplementation(libs.mockito.core)
9797
testImplementation(libs.truth)
98-
testImplementation("org.skyscreamer:jsonassert:1.5.0")
98+
testImplementation(libs.jsonassert)
9999

100100
androidTestImplementation(libs.truth)
101101
androidTestImplementation(libs.junit)
102102
androidTestImplementation(libs.mockito.core)
103103
androidTestImplementation(libs.androidx.test.runner)
104-
androidTestImplementation("org.skyscreamer:jsonassert:1.5.0")
105-
androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
106-
androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.1")
104+
androidTestImplementation(libs.jsonassert)
105+
androidTestImplementation(libs.mockito.dexmaker)
106+
androidTestImplementation(libs.dexmaker)
107107
}

firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ dependencies {
117117

118118
implementation libs.playservices.basement
119119

120-
testImplementation 'androidx.test:runner:1.4.0'
120+
testImplementation libs.androidx.test.runner
121121
testImplementation libs.junit
122-
testImplementation 'org.mockito:mockito-core:3.4.3'
122+
testImplementation libs.mockito.core
123123
testImplementation libs.robolectric
124124

125125
androidTestImplementation libs.androidx.test.core
126-
androidTestImplementation 'androidx.test:runner:1.4.0'
126+
androidTestImplementation libs.androidx.test.runner
127127
androidTestImplementation libs.protobuf.java.lite
128-
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
129-
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
130-
androidTestImplementation 'org.mockito:mockito-core:3.4.3'
128+
androidTestImplementation libs.dexmaker
129+
androidTestImplementation libs.mockito.dexmaker
130+
androidTestImplementation libs.mockito.core
131131
}

firebase-crashlytics/firebase-crashlytics.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ dependencies {
106106
androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
107107
androidTestImplementation(libs.protobuf.java)
108108
androidTestImplementation(libs.truth)
109-
androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
109+
androidTestImplementation(libs.dexmaker)
110110
androidTestImplementation(libs.mockito.dexmaker)
111-
androidTestImplementation("org.mockito:mockito-core:4.7.0")
111+
androidTestImplementation(libs.mockito.core)
112112
androidTestImplementation(libs.androidx.test.junit)
113113
androidTestImplementation(libs.androidx.test.runner)
114114
androidTestImplementation(libs.truth)

firebase-database/firebase-database.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ dependencies {
8080
implementation(libs.kotlinx.coroutines.core)
8181
api(libs.playservices.tasks)
8282

83-
testImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
84-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
83+
testImplementation(libs.jackson.core)
84+
testImplementation(libs.jackson.databind)
8585
testImplementation("com.firebase:firebase-token-generator:2.0.0")
8686
testImplementation(libs.androidx.test.core)
8787
testImplementation(libs.androidx.test.rules)
@@ -91,10 +91,10 @@ dependencies {
9191
testImplementation(libs.robolectric)
9292
testImplementation(libs.truth)
9393

94-
androidTestImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
95-
androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
96-
androidTestImplementation("org.hamcrest:hamcrest:2.2")
97-
androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
94+
androidTestImplementation(libs.jackson.core)
95+
androidTestImplementation(libs.jackson.databind)
96+
androidTestImplementation(libs.hamcrest)
97+
androidTestImplementation(libs.hamcrest.library)
9898
androidTestImplementation(libs.androidx.test.junit)
9999
androidTestImplementation(libs.androidx.test.runner)
100100
androidTestImplementation(libs.junit)

firebase-datatransport/firebase-datatransport.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ dependencies {
5252
api 'com.google.firebase:firebase-common:21.0.0'
5353
api 'com.google.firebase:firebase-components:18.0.0'
5454

55-
implementation 'androidx.annotation:annotation:1.1.0'
55+
implementation libs.androidx.annotation
5656
implementation 'com.google.android.datatransport:transport-api:3.1.0'
5757
implementation 'com.google.android.datatransport:transport-backend-cct:3.2.0'
5858
implementation 'com.google.android.datatransport:transport-runtime:3.2.0'
5959
implementation(libs.kotlin.stdlib.jdk8)
6060

6161
testImplementation libs.androidx.test.core
62-
testImplementation 'androidx.test:runner:1.2.0'
62+
testImplementation libs.androidx.test.runner
6363
testImplementation libs.truth
64-
testImplementation 'junit:junit:4.12'
64+
testImplementation libs.junit
6565
testImplementation libs.robolectric
6666
}

firebase-dynamic-links/firebase-dynamic-links.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ android {
5959
}
6060

6161
dependencies {
62-
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
62+
javadocClasspath libs.autovalue.annotations
6363
javadocClasspath libs.findbugs.jsr305
64-
javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
64+
javadocClasspath libs.checker.qual
6565

66-
api 'com.google.android.gms:play-services-tasks:18.0.1'
66+
api libs.playservices.tasks
6767
api('com.google.firebase:firebase-auth-interop:20.0.0') {
6868
exclude group: "com.google.firebase", module: "firebase-common"
6969
}
@@ -74,27 +74,27 @@ dependencies {
7474
exclude group: 'com.google.firebase', module: 'firebase-common'
7575
}
7676

77-
implementation 'androidx.annotation:annotation:1.2.0'
77+
implementation libs.androidx.annotation
7878
implementation libs.playservices.base
7979
implementation libs.playservices.basement
8080
implementation libs.kotlin.stdlib
8181

82-
testAnnotationProcessor "com.google.auto.value:auto-value:1.6.3"
82+
testAnnotationProcessor libs.autovalue
8383

8484
testImplementation libs.androidx.test.core
85-
testImplementation 'com.android.support.test:runner:1.0.2'
86-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2'
85+
testImplementation libs.runner
86+
testImplementation libs.jackson.databind
8787
testImplementation('com.google.android.gms:play-services-appinvite:18.0.0') {
8888
exclude group: 'com.google.firebase', module: 'firebase-common'
8989
exclude group: 'com.google.firebase', module: 'firebase-dynamic-links'
9090
}
9191
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
9292
testImplementation libs.truth
93-
testImplementation 'junit:junit:4.12'
9493
testImplementation libs.junit
95-
testImplementation 'org.mockito:mockito-core:2.25.0'
96-
testImplementation 'org.mockito:mockito-core:3.3.3'
94+
testImplementation libs.junit
95+
testImplementation libs.mockito.core
96+
testImplementation libs.mockito.core
9797
testImplementation libs.robolectric
9898

99-
testCompileOnly 'com.google.auto.value:auto-value-annotations:1.6.3'
99+
testCompileOnly libs.autovalue.annotations
100100
}

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/PendingDynamicLinkDataTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static junit.framework.Assert.assertNull;
2222
import static org.mockito.ArgumentMatchers.any;
2323
import static org.mockito.ArgumentMatchers.anyInt;
24-
import static org.mockito.Matchers.eq;
24+
import static org.mockito.ArgumentMatchers.eq;
2525
import static org.mockito.Mockito.when;
2626

2727
import android.content.Context;

firebase-dynamic-links/src/test/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinksImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static junit.framework.Assert.assertTrue;
2121
import static junit.framework.Assert.fail;
2222
import static org.mockito.ArgumentMatchers.any;
23-
import static org.mockito.Matchers.eq;
23+
import static org.mockito.ArgumentMatchers.eq;
2424
import static org.mockito.Mockito.verify;
2525

2626
import android.content.Intent;

0 commit comments

Comments
 (0)