Skip to content

Commit d96507b

Browse files
daymxndaymxn
authored
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
1 parent 7220e42 commit d96507b

File tree

56 files changed

+235
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+235
-240
lines changed

‎appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ dependencies {
6060
api 'com.google.firebase:firebase-common-ktx:21.0.0'
6161
api 'com.google.firebase:firebase-components:18.0.0'
6262

63-
implementation "androidx.test:core:$androidxTestCoreVersion"
63+
implementation libs.androidx.test.core
6464
implementation 'com.google.android.gms:play-services-base:18.0.1'
6565
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
6666

6767
testImplementation project(':appcheck:firebase-appcheck-playintegrity')
68-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
69-
testImplementation "com.google.truth:truth:$googleTruthVersion"
68+
testImplementation libs.androidx.test.core
69+
testImplementation libs.truth
7070
testImplementation 'junit:junit:4.13-beta-2'
7171
testImplementation 'org.mockito:mockito-core:2.25.0'
72-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
72+
testImplementation libs.robolectric
7373

7474
androidTestImplementation project(':firebase-storage')
7575
androidTestImplementation 'androidx.test:runner:1.2.0'
76-
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
77-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
76+
androidTestImplementation libs.androidx.test.junit
77+
androidTestImplementation libs.truth
7878
androidTestImplementation 'junit:junit:4.13-beta-2'
7979
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
8080
}

‎appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ dependencies {
6363
exclude group: 'com.google.firebase', module: 'firebase-common'
6464
exclude group: 'com.google.firebase', module: 'firebase-components'
6565
}
66-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
66+
testImplementation libs.androidx.test.core
6767
testImplementation 'androidx.test:rules:1.2.0'
68-
testImplementation "com.google.truth:truth:$googleTruthVersion"
68+
testImplementation libs.truth
6969
testImplementation 'junit:junit:4.13-beta-2'
7070
testImplementation 'org.mockito:mockito-core:2.25.0'
71-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
71+
testImplementation libs.robolectric
7272
}

‎appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ dependencies {
4949
implementation 'com.google.android.gms:play-services-base:18.0.1'
5050
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
5151

52-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
52+
testImplementation libs.androidx.test.core
5353
testImplementation 'androidx.test:rules:1.2.0'
54-
testImplementation "com.google.truth:truth:$googleTruthVersion"
54+
testImplementation libs.truth
5555
testImplementation 'junit:junit:4.12'
5656
testImplementation 'org.mockito:mockito-core:2.25.0'
57-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
57+
testImplementation libs.robolectric
5858
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ dependencies {
6464
exclude group: 'com.google.firebase', module: 'firebase-common'
6565
exclude group: 'com.google.firebase', module: 'firebase-components'
6666
}
67-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
68-
testImplementation "com.google.truth:truth:$googleTruthVersion"
69-
testImplementation 'junit:junit:4.13.2'
67+
testImplementation libs.androidx.test.core
68+
testImplementation libs.truth
69+
testImplementation libs.junit
7070
testImplementation 'org.mockito:mockito-core:3.4.6'
71-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
71+
testImplementation libs.robolectric
7272
}

‎appcheck/firebase-appcheck/firebase-appcheck.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,40 @@ 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'
63-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
62+
implementation libs.playservices.base
63+
implementation libs.kotlin.stdlib
6464

6565
testImplementation(project(":integ-testing")){
6666
exclude group: 'com.google.firebase', module: 'firebase-common'
6767
exclude group: 'com.google.firebase', module: 'firebase-components'
6868
}
69-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
69+
testImplementation libs.androidx.test.core
7070
testImplementation 'androidx.test:rules:1.2.0'
71-
testImplementation "com.google.truth:truth:$googleTruthVersion"
71+
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'
76-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
76+
testImplementation libs.robolectric
7777

7878
androidTestImplementation project(':appcheck:firebase-appcheck')
7979
androidTestImplementation(project(":integ-testing")){
8080
exclude group: 'com.google.firebase', module: 'firebase-common'
8181
exclude group: 'com.google.firebase', module: 'firebase-components'
8282
}
8383
androidTestImplementation "androidx.annotation:annotation:1.0.0"
84-
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
84+
androidTestImplementation libs.androidx.test.core
8585
androidTestImplementation 'androidx.test:runner:1.2.0'
86-
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
87-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
86+
androidTestImplementation libs.androidx.test.junit
87+
androidTestImplementation libs.truth
8888
androidTestImplementation 'junit:junit:4.12'
8989
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
9090
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'

‎appcheck/firebase-appcheck/ktx/ktx.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ dependencies {
6161

6262
implementation("com.google.firebase:firebase-components:18.0.0")
6363

64-
testImplementation "com.google.truth:truth:$googleTruthVersion"
64+
testImplementation libs.truth
6565
testImplementation 'junit:junit:4.12'
6666
testImplementation 'org.mockito:mockito-core:2.25.0'
67-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
67+
testImplementation libs.robolectric
6868

69-
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
69+
androidTestImplementation libs.androidx.test.core
7070
androidTestImplementation 'androidx.test:runner:1.2.0'
7171
androidTestImplementation 'com.google.firebase:firebase-appcheck-interop:17.1.0'
72-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
72+
androidTestImplementation libs.truth
7373
androidTestImplementation 'junit:junit:4.12'
7474
}

‎build.gradle‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
// limitations under the License.
1414

1515
buildscript {
16-
// TODO: remove once all sdks have migrated to version catalog
17-
ext.kotlinVersion = libs.versions.kotlin.get()
18-
ext.coroutinesVersion = libs.versions.coroutines.get()
19-
2016
repositories {
2117
google()
2218
mavenCentral()
@@ -47,15 +43,6 @@ buildscript {
4743
apply from: 'sdkProperties.gradle'
4844
apply from: "gradle/errorProne.gradle"
4945

50-
ext {
51-
// TODO: remove once all sdks have migrated to version catalog
52-
googleTruthVersion = libs.versions.truth.get()
53-
grpcVersion = libs.versions.grpc.get()
54-
robolectricVersion = libs.versions.robolectric.get()
55-
androidxTestCoreVersion = libs.versions.androidx.test.core.get()
56-
androidxTestJUnitVersion = libs.versions.androidx.test.junit.get()
57-
}
58-
5946
apply plugin: com.google.firebase.gradle.plugins.PublishingPlugin
6047

6148
apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin

‎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

‎encoders/firebase-decoders-json/firebase-decoders-json.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ dependencies {
4949
implementation 'androidx.annotation:annotation:1.1.0'
5050

5151
testImplementation 'androidx.test:runner:1.2.0'
52-
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
53-
testImplementation "com.google.truth:truth:$googleTruthVersion"
52+
testImplementation libs.androidx.test.junit
53+
testImplementation libs.truth
5454
testImplementation 'junit:junit:4.13-rc-1'
5555
testImplementation 'org.mockito:mockito-core:2.25.0'
56-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
56+
testImplementation libs.robolectric
5757
}
5858

5959
tasks.withType(JavaCompile) {

‎encoders/firebase-encoders-json/firebase-encoders-json.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ dependencies {
5555
implementation 'androidx.annotation:annotation:1.1.0'
5656

5757
testImplementation 'androidx.test:runner:1.3.0'
58-
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
58+
testImplementation libs.androidx.test.junit
5959
testImplementation "com.google.truth:truth:1.0.1"
6060
testImplementation 'junit:junit:4.13'
6161
testImplementation 'org.mockito:mockito-core:3.3.3'
62-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
62+
testImplementation libs.robolectric
6363
}
6464

6565
tasks.withType(JavaCompile) {

0 commit comments

Comments
 (0)