Merge branch 'main' into daymon-migrate-tests-to-junit4

Author: daymxn

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'
 }

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
 }

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
 }

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
 }

appcheck/firebase-appcheck/firebase-appcheck.gradle

@@ -51,40 +51,40 @@ 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")
     api("com.google.firebase:firebase-common-ktx:21.0.0")
     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")){
         exclude group: 'com.google.firebase', module: 'firebase-common'
         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'

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'
 }

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
@@ -88,7 +75,7 @@ configure(subprojects) {
         java {
             target 'src/**/*.java'
             targetExclude '**/test/resources/**'
-            googleJavaFormat('1.22.0').reorderImports(false).skipJavadocFormatting()
+            googleJavaFormat('1.22.0').reorderImports(true).skipJavadocFormatting()
         }
         kotlin {
             target 'src/**/*.kt'

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")
 }
 

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) {

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) {