Update target to SDK 33

utzcoz · utzcoz · commit 5ee585fc18f7 · 2023-07-09T18:41:19.000+08:00
We need to update AXT core and AndroidX ext JUnit version to ensure
using proper AXT dependency that export necessary Activities for higher
target SDKs.

This CL also disables lint for some sub-projets and anyone can remove it
and fix warnings.

Signed-off-by: utzcoz &lt;utzcoz@outlook.com&gt;
diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -53,21 +53,21 @@ dependencies {
     implementation 'com.google.firebase:firebase-appcheck-interop:17.0.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
-    implementation 'androidx.test:core:1.2.0'
+    implementation "androidx.test:core:$androidxTestCoreVersion"
 
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation project(':appcheck:firebase-appcheck-safetynet')
 
     androidTestImplementation project(':firebase-storage')
     androidTestImplementation 'junit:junit:4.13-beta-2'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
 }
diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -57,6 +57,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle b/appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
@@ -50,6 +50,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -58,5 +58,5 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:3.4.6'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
-    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle b/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle
@@ -57,6 +57,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:rules:1.2.0'
 }
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -59,12 +59,12 @@ dependencies {
     testImplementation 'org.mockito:mockito-inline:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'androidx.test:rules:1.2.0'
 
     androidTestImplementation project(':appcheck:firebase-appcheck')
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
diff --git a/appcheck/firebase-appcheck/ktx/ktx.gradle b/appcheck/firebase-appcheck/ktx/ktx.gradle
@@ -69,5 +69,5 @@ dependencies {
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/build.gradle b/build.gradle
@@ -51,6 +51,8 @@ ext {
     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()
     protocVersion = libs.versions.protoc.get()
     javaliteVersion = libs.versions.javalite.get()
     protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
diff --git a/encoders/firebase-decoders-json/firebase-decoders-json.gradle b/encoders/firebase-decoders-json/firebase-decoders-json.gradle
@@ -46,7 +46,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
 
     testImplementation 'androidx.test:runner:1.2.0'
-    testImplementation 'androidx.test.ext:junit:1.1.1'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13-rc-1'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
diff --git a/encoders/firebase-encoders-json/firebase-encoders-json.gradle b/encoders/firebase-encoders-json/firebase-encoders-json.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-encoders:17.0.0'
 
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13'
     testImplementation "com.google.truth:truth:1.0.1"
diff --git a/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle b/encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-encoders-json:18.0.0'
 
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13'
     testImplementation 'com.google.truth:truth:1.0.1'
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -49,7 +49,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'org.mockito:mockito-inline:3.4.0'
     testImplementation project(':firebase-appdistribution-api')
     androidTestImplementation "org.mockito:mockito-android:3.4.0"
diff --git a/firebase-appdistribution-api/ktx/ktx.gradle b/firebase-appdistribution-api/ktx/ktx.gradle
@@ -68,5 +68,5 @@ dependencies {
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-appdistribution/firebase-appdistribution.gradle b/firebase-appdistribution/firebase-appdistribution.gradle
@@ -65,7 +65,7 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-inline:3.4.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 
@@ -76,7 +76,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
 
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
diff --git a/firebase-config/firebase-config.gradle b/firebase-config/firebase-config.gradle
@@ -74,7 +74,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'org.mockito:mockito-core:2.25.0'
diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle
@@ -59,5 +59,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -116,7 +116,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:3.4.3'
 
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:core:1.4.0'
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
     androidTestImplementation 'org.mockito:mockito-core:3.4.3'
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -80,16 +80,16 @@ dependencies {
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
 
     testImplementation 'androidx.test:runner:1.4.0'
-    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.4.3'
 
 
     androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test:core:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'org.mockito:mockito-core:3.4.3'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle
@@ -57,5 +57,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -74,7 +74,7 @@ dependencies {
     javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.android.support.test:runner:1.0.2'
     testImplementation 'org.mockito:mockito-core:3.3.3'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
diff --git a/firebase-dynamic-links/ktx/ktx.gradle b/firebase-dynamic-links/ktx/ktx.gradle
@@ -56,5 +56,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:2.25.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -153,7 +153,7 @@ dependencies {
 
     testImplementation project(':firebase-firestore')
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
@@ -172,7 +172,7 @@ dependencies {
     androidTestImplementation "androidx.annotation:annotation:1.1.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
 }
 
 gradle.projectsEvaluated {
diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle
@@ -68,5 +68,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -40,6 +40,7 @@ android {
         // jetification in our SDK build will still require developers to use jetification in their
         // apps.
         disable "GradleCompatible"
+        disable "WrongConstant"
     }
 
     compileOptions {
@@ -101,11 +102,11 @@ dependencies {
     testImplementation "junit:junit:4.12"
     testImplementation "org.mockito:mockito-core:2.25.0"
     testImplementation "com.google.truth:truth:1.0"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.google.guava:guava:30.1-android'
 
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation "org.mockito:mockito-core:2.25.0"
     androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
diff --git a/firebase-inappmessaging-display/ktx/ktx.gradle b/firebase-inappmessaging-display/ktx/ktx.gradle
@@ -60,5 +60,5 @@ dependencies {
     testImplementation ("com.google.firebase:firebase-analytics:17.0.0") {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml b/firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
   <application>
     <uses-library android:name="android.test.runner"/>
-    <activity android:name=".TestActivity">
+    <activity android:name=".TestActivity" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -138,17 +138,17 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'androidx.test:runner:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
     testImplementation "io.grpc:grpc-testing:$grpcVersion"
     testImplementation 'com.google.guava:guava:30.1-android'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation project(":integ-testing")
 
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "androidx.annotation:annotation:1.0.0"
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/firebase-inappmessaging/ktx/ktx.gradle b/firebase-inappmessaging/ktx/ktx.gradle
@@ -55,5 +55,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
@@ -56,15 +56,15 @@ dependencies {
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
 
     testImplementation project(':integ-testing')
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'org.mockito:mockito-inline:2.25.0'
 
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
diff --git a/firebase-installations/ktx/ktx.gradle b/firebase-installations/ktx/ktx.gradle
@@ -53,5 +53,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.13'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle
@@ -105,7 +105,7 @@ dependencies {
 
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.google.android.gms:play-services-cloud-messaging:17.0.1'
     testImplementation 'androidx.test:rules:1.2.0'
     testImplementation 'androidx.test:runner:1.2.0'
@@ -131,7 +131,7 @@ dependencies {
     testImplementation 'androidx.core:core:1.6.0'
 
     androidTestImplementation project(':integ-testing')
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'junit:junit:4.12'
diff --git a/firebase-messaging/ktx/ktx.gradle b/firebase-messaging/ktx/ktx.gradle
@@ -53,5 +53,5 @@ dependencies {
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
 }
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -59,6 +59,9 @@ android {
             includeAndroidResources = true
         }
     }
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
 }
 
 dependencies {
@@ -91,7 +94,7 @@ dependencies {
     annotationProcessor project(":encoders:firebase-encoders-processor")
 
     testImplementation(project(":integ-testing"))
-    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation "androidx.test:core:$androidxTestCoreVersion"
     testImplementation 'com.github.tomakehurst:wiremock-standalone:2.26.3'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
@@ -106,7 +109,7 @@ dependencies {
     androidTestImplementation 'junit:junit:4.13.1'
     androidTestImplementation "androidx.annotation:annotation:1.1.0"
     androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
 }
 
diff --git a/firebase-ml-modeldownloader/ktx/ktx.gradle b/firebase-ml-modeldownloader/ktx/ktx.gradle
@@ -54,5 +54,5 @@ dependencies {
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:3.6.0'
     testImplementation 'androidx.test:runner:1.5.1'
-    testImplementation 'androidx.test.ext:junit:1.1.4'
+    testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
 }
diff --git a/firebase-ml-modeldownloader/lint-baseline.xml b/firebase-ml-modeldownloader/lint-baseline.xml
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
diff --git a/firebase-perf/e2e-app/e2e-app.gradle b/firebase-perf/e2e-app/e2e-app.gradle
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
diff --git a/firebase-perf/ktx/ktx.gradle b/firebase-perf/ktx/ktx.gradle
diff --git a/firebase-segmentation/firebase-segmentation.gradle b/firebase-segmentation/firebase-segmentation.gradle
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
diff --git a/firebase-storage/ktx/ktx.gradle b/firebase-storage/ktx/ktx.gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/health-metrics/benchmark/template/app/build.gradle.mustache b/health-metrics/benchmark/template/app/build.gradle.mustache
diff --git a/health-metrics/benchmark/template/macrobenchmark/build.gradle b/health-metrics/benchmark/template/macrobenchmark/build.gradle
diff --git a/sdkProperties.gradle b/sdkProperties.gradle
diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle
diff --git a/transport/transport-backend-cct/transport-backend-cct.gradle b/transport/transport-backend-cct/transport-backend-cct.gradle
diff --git a/transport/transport-runtime-testing/transport-runtime-testing.gradle b/transport/transport-runtime-testing/transport-runtime-testing.gradle
diff --git a/transport/transport-runtime/transport-runtime.gradle b/transport/transport-runtime/transport-runtime.gradle

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ dependencies {`
`57`	`57`	`testImplementation 'org.mockito:mockito-core:2.25.0'`
`58`	`58`	`testImplementation "org.robolectric:robolectric:$robolectricVersion"`
`59`	`59`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`60`		`- testImplementation 'androidx.test:core:1.2.0'`
	`60`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`61`	`61`	`testImplementation 'androidx.test:rules:1.2.0'`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ dependencies {`
`50`	`50`	`testImplementation 'org.mockito:mockito-core:2.25.0'`
`51`	`51`	`testImplementation "org.robolectric:robolectric:$robolectricVersion"`
`52`	`52`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`53`		`- testImplementation 'androidx.test:core:1.2.0'`
	`53`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`54`	`54`	`testImplementation 'androidx.test:rules:1.2.0'`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,5 @@ dependencies {`
`58`	`58`	`testImplementation 'org.mockito:mockito-core:3.4.6'`
`59`	`59`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`60`	`60`	`testImplementation "org.robolectric:robolectric:$robolectricVersion"`
`61`		`- testImplementation 'androidx.test:core:1.4.0'`
	`61`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,5 @@ dependencies {`
`69`	`69`	`androidTestImplementation 'junit:junit:4.12'`
`70`	`70`	`androidTestImplementation "com.google.truth:truth:$googleTruthVersion"`
`71`	`71`	`androidTestImplementation 'androidx.test:runner:1.2.0'`
`72`		`- androidTestImplementation 'androidx.test:core:1.2.0'`
	`72`	`+ androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@ dependencies {`
`68`	`68`	`androidTestImplementation 'junit:junit:4.12'`
`69`	`69`	`androidTestImplementation "com.google.truth:truth:$googleTruthVersion"`
`70`	`70`	`androidTestImplementation 'androidx.test:runner:1.2.0'`
`71`		`- androidTestImplementation 'androidx.test:core:1.2.0'`
	`71`	`+ androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,5 @@ dependencies {`
`59`	`59`	`testImplementation 'junit:junit:4.12'`
`60`	`60`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`61`	`61`	`testImplementation 'org.mockito:mockito-core:2.25.0'`
`62`		`- testImplementation 'androidx.test:core:1.2.0'`
	`62`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ dependencies {`
`57`	`57`	`testImplementation "org.robolectric:robolectric:$robolectricVersion"`
`58`	`58`	`testImplementation 'junit:junit:4.12'`
`59`	`59`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`60`		`- testImplementation 'androidx.test:core:1.2.0'`
	`60`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@ dependencies {`
`56`	`56`	`testImplementation 'junit:junit:4.12'`
`57`	`57`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`58`	`58`	`testImplementation 'org.mockito:mockito-core:2.25.0'`
`59`		`- testImplementation 'androidx.test:core:1.2.0'`
	`59`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ dependencies {`
`60`	`60`	`testImplementation ("com.google.firebase:firebase-analytics:17.0.0") {`
`61`	`61`	`exclude group: "com.google.firebase", module: "firebase-common"`
`62`	`62`	`}`
`63`		`- testImplementation 'androidx.test:core:1.2.0'`
	`63`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ dependencies {`
`55`	`55`	`testImplementation "org.robolectric:robolectric:$robolectricVersion"`
`56`	`56`	`testImplementation 'junit:junit:4.12'`
`57`	`57`	`testImplementation "com.google.truth:truth:$googleTruthVersion"`
`58`		`- testImplementation 'androidx.test:core:1.2.0'`
	`58`	`+ testImplementation "androidx.test:core:$androidxTestCoreVersion"`
`59`	`59`	`}`