Skip to content

Commit 4912a87

Browse files
committed
Use version catalog for same versions
1 parent cbe699a commit 4912a87

File tree

33 files changed

+70
-59
lines changed

33 files changed

+70
-59
lines changed

appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
}
6767
testImplementation libs.androidx.test.core
6868
testImplementation libs.truth
69-
testImplementation 'junit:junit:4.13.2'
69+
testImplementation libs.junit
7070
testImplementation 'org.mockito:mockito-core:3.4.6'
7171
testImplementation libs.robolectric
7272
}

appcheck/firebase-appcheck/firebase-appcheck.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ android {
5151
dependencies {
5252
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
5353

54-
api 'com.google.android.gms:play-services-tasks:18.1.0'
54+
api libs.playservices.tasks
5555
api 'com.google.firebase:firebase-annotations:16.2.0'
5656
api "com.google.firebase:firebase-appcheck-interop:17.1.0"
5757
api("com.google.firebase:firebase-common:21.0.0")
5858
api("com.google.firebase:firebase-common-ktx:21.0.0")
5959
api("com.google.firebase:firebase-components:18.0.0")
6060

6161
implementation 'androidx.annotation:annotation:1.1.0'
62-
implementation 'com.google.android.gms:play-services-base:18.1.0'
62+
implementation libs.playservices.base
6363
implementation libs.kotlin.stdlib
6464

6565
testImplementation(project(":integ-testing")){
@@ -71,7 +71,7 @@ dependencies {
7171
testImplementation libs.truth
7272
testImplementation 'junit:junit:4.12'
7373
testImplementation 'junit:junit:4.13-beta-2'
74-
testImplementation 'org.mockito:mockito-core:5.2.0'
74+
testImplementation libs.mockito.core
7575
testImplementation 'org.mockito:mockito-inline:5.2.0'
7676
testImplementation libs.robolectric
7777

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
implementation("com.google.auto.value:auto-value-annotations:1.8.1")
4444
annotationProcessor("com.google.auto.value:auto-value:1.6.5")
4545
implementation(kotlin("gradle-plugin", "1.8.22"))
46-
implementation("org.json:json:20210307")
46+
implementation(libs.org.json)
4747

4848
implementation("org.eclipse.aether:aether-api:1.0.0.v20140518")
4949
implementation("org.eclipse.aether:aether-util:1.0.0.v20140518")
@@ -63,8 +63,8 @@ dependencies {
6363
implementation(libs.android.gradlePlugin.builder.test.api)
6464

6565
testImplementation(libs.bundles.kotest)
66-
testImplementation("junit:junit:4.13.2")
67-
testImplementation("com.google.truth:truth:1.4.2")
66+
testImplementation(libs.junit)
67+
testImplementation(libs.truth)
6868
testImplementation("commons-io:commons-io:2.15.1")
6969
}
7070

firebase-abt/firebase-abt.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
exclude group: "com.google.firebase", module: "firebase-common"
6262
}
6363

64-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
64+
implementation(libs.kotlin.stdlib.jdk8)
6565

6666
testImplementation 'androidx.test:runner:1.2.0'
6767
testImplementation 'androidx.test.espresso:espresso-core:3.2.0'

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ dependencies {
6767
testImplementation project(':firebase-appdistribution-api')
6868
testImplementation libs.androidx.test.core
6969
testImplementation libs.truth
70-
testImplementation 'junit:junit:4.12'
71-
testImplementation 'junit:junit:4.13.2'
70+
testImplementation libs.junit
7271
testImplementation 'org.mockito:mockito-core:2.25.0'
7372
testImplementation 'org.mockito:mockito-inline:3.4.0'
7473
testImplementation libs.robolectric

firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dependencies {
7878
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
7979
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
8080
implementation libs.javax.inject
81-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
81+
implementation libs.kotlin.stdlib.jdk8
8282

8383
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
8484

@@ -97,7 +97,7 @@ dependencies {
9797
}
9898
testImplementation libs.androidx.test.core
9999
testImplementation libs.truth
100-
testImplementation 'junit:junit:4.13.2'
100+
testImplementation libs.junit
101101
testImplementation 'org.mockito:mockito-inline:5.2.0'
102102
testImplementation libs.robolectric
103103

firebase-appdistribution/test-app/test-app.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,5 @@ dependencies {
100100
// Beta flavor uses the full implementation
101101
betaImplementation project(':firebase-appdistribution')
102102

103-
testImplementation 'junit:junit:4.13.2'
103+
testImplementation libs.junit
104104
}

firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050

5151
dependencies {
5252
implementation("com.google.android.play:feature-delivery:2.0.0")
53-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
53+
implementation(libs.kotlin.stdlib.jdk8)
5454
api("com.google.firebase:firebase-common:21.0.0")
5555
api("com.google.firebase:firebase-components:18.0.0")
5656
}

firebase-config-interop/firebase-config-interop.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ dependencies {
5151
api("com.google.firebase:firebase-encoders-json:18.0.1")
5252
api("com.google.firebase:firebase-encoders:17.0.0")
5353

54-
compileOnly("com.google.auto.value:auto-value-annotations:1.10.1")
54+
compileOnly(libs.autovalue.annotations)
5555

56-
annotationProcessor("com.google.auto.value:auto-value:1.10.1")
56+
annotationProcessor(libs.autovalue)
5757
annotationProcessor(project(":encoders:firebase-encoders-processor"))
5858

5959
testImplementation(libs.junit)

firebase-config/firebase-config.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ dependencies {
8585
annotationProcessor("com.google.auto.value:auto-value:1.6.6")
8686
javadocClasspath("com.google.auto.value:auto-value-annotations:1.6.6")
8787
compileOnly("com.google.auto.value:auto-value-annotations:1.6.6")
88-
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
88+
compileOnly(libs.findbugs.jsr305)
8989

9090
// Testing
9191
testImplementation(libs.junit)

0 commit comments

Comments
 (0)