Skip to content

Commit 79d24f0

Browse files
utzcozrlazo
andauthored
Bump AXT dependencies to 1.5.0 (#5169)
It is prepared for SDK 31+ to make test Activity exported. Signed-off-by: utzcoz <[email protected]> Co-authored-by: Rodrigo Lazo <[email protected]>
1 parent 965ac2f commit 79d24f0

File tree

47 files changed

+68
-64
lines changed

Some content is hidden

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

47 files changed

+68
-64
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ dependencies {
5353
implementation 'com.google.firebase:firebase-appcheck-interop:17.0.0'
5454
implementation 'com.google.android.gms:play-services-base:18.0.1'
5555
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
56-
implementation 'androidx.test:core:1.2.0'
56+
implementation "androidx.test:core:$androidxTestCoreVersion"
5757

5858
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
5959

6060
testImplementation 'junit:junit:4.13-beta-2'
6161
testImplementation 'org.mockito:mockito-core:2.25.0'
6262
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6363
testImplementation "com.google.truth:truth:$googleTruthVersion"
64-
testImplementation 'androidx.test:core:1.2.0'
64+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6565
testImplementation project(':appcheck:firebase-appcheck-safetynet')
6666

6767
androidTestImplementation project(':firebase-storage')
6868
androidTestImplementation 'junit:junit:4.13-beta-2'
6969
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
70-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
70+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
7171
androidTestImplementation 'androidx.test:runner:1.2.0'
7272
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
7373
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ dependencies {
5757
testImplementation 'org.mockito:mockito-core:2.25.0'
5858
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5959
testImplementation "com.google.truth:truth:$googleTruthVersion"
60-
testImplementation 'androidx.test:core:1.2.0'
60+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6161
testImplementation 'androidx.test:rules:1.2.0'
6262
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ dependencies {
5050
testImplementation 'org.mockito:mockito-core:2.25.0'
5151
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5252
testImplementation "com.google.truth:truth:$googleTruthVersion"
53-
testImplementation 'androidx.test:core:1.2.0'
53+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
5454
testImplementation 'androidx.test:rules:1.2.0'
5555
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ dependencies {
5858
testImplementation 'org.mockito:mockito-core:3.4.6'
5959
testImplementation "com.google.truth:truth:$googleTruthVersion"
6060
testImplementation "org.robolectric:robolectric:$robolectricVersion"
61-
testImplementation 'androidx.test:core:1.4.0'
61+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6262
}

appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ dependencies {
5757
testImplementation 'org.mockito:mockito-core:2.25.0'
5858
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5959
testImplementation "com.google.truth:truth:$googleTruthVersion"
60-
testImplementation 'androidx.test:core:1.2.0'
60+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6161
testImplementation 'androidx.test:rules:1.2.0'
6262
}

appcheck/firebase-appcheck/firebase-appcheck.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ dependencies {
5959
testImplementation 'org.mockito:mockito-inline:2.25.0'
6060
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6161
testImplementation "com.google.truth:truth:$googleTruthVersion"
62-
testImplementation 'androidx.test:core:1.2.0'
62+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6363
testImplementation 'androidx.test:rules:1.2.0'
6464

6565
androidTestImplementation project(':appcheck:firebase-appcheck')
6666
androidTestImplementation project(':integ-testing')
67-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
67+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
6868
androidTestImplementation 'androidx.test:runner:1.2.0'
6969
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
7070
androidTestImplementation 'junit:junit:4.12'

appcheck/firebase-appcheck/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ dependencies {
6969
androidTestImplementation 'junit:junit:4.12'
7070
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
7171
androidTestImplementation 'androidx.test:runner:1.2.0'
72-
androidTestImplementation 'androidx.test:core:1.2.0'
72+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
7373
}

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ ext {
5151
googleTruthVersion = libs.versions.truth.get()
5252
grpcVersion = libs.versions.grpc.get()
5353
robolectricVersion = libs.versions.robolectric.get()
54+
androidxTestCoreVersion = libs.versions.androidx.test.core.get()
55+
androidxTestJUnitVersion = libs.versions.androidx.test.junit.get()
5456
protocVersion = libs.versions.protoc.get()
5557
javaliteVersion = libs.versions.javalite.get()
5658
protobufJavaUtilVersion = libs.versions.protobufjavautil.get()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
implementation 'androidx.annotation:annotation:1.1.0'
4747

4848
testImplementation 'androidx.test:runner:1.2.0'
49-
testImplementation 'androidx.test.ext:junit:1.1.1'
49+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
5050
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5151
testImplementation 'junit:junit:4.13-rc-1'
5252
testImplementation "com.google.truth:truth:$googleTruthVersion"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
implementation 'com.google.firebase:firebase-encoders:17.0.0'
5252

5353
testImplementation 'androidx.test:runner:1.3.0'
54-
testImplementation 'androidx.test.ext:junit:1.1.2'
54+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
5555
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5656
testImplementation 'junit:junit:4.13'
5757
testImplementation "com.google.truth:truth:1.0.1"

encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
implementation 'com.google.firebase:firebase-encoders-json:18.0.0'
4949

5050
testImplementation 'androidx.test:runner:1.3.0'
51-
testImplementation 'androidx.test.ext:junit:1.1.2'
51+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
5252
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5353
testImplementation 'junit:junit:4.13'
5454
testImplementation 'com.google.truth:truth:1.0.1'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
testImplementation 'junit:junit:4.13.2'
5050
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5151
testImplementation "com.google.truth:truth:$googleTruthVersion"
52-
testImplementation 'androidx.test:core:1.2.0'
52+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
5353
testImplementation 'org.mockito:mockito-inline:3.4.0'
5454
testImplementation project(':firebase-appdistribution-api')
5555
androidTestImplementation "org.mockito:mockito-android:3.4.0"

firebase-appdistribution-api/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ dependencies {
6868
androidTestImplementation 'junit:junit:4.12'
6969
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
7070
androidTestImplementation 'androidx.test:runner:1.2.0'
71-
androidTestImplementation 'androidx.test:core:1.2.0'
71+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
7272
}

firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
testImplementation "org.robolectric:robolectric:$robolectricVersion"
7070
testImplementation "com.google.truth:truth:$googleTruthVersion"
7171
testImplementation 'org.mockito:mockito-inline:3.4.0'
72-
testImplementation 'androidx.test:core:1.2.0'
72+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
7373

7474
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
7575

@@ -80,7 +80,7 @@ dependencies {
8080
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
8181

8282
androidTestImplementation project(':integ-testing')
83-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
83+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
8484
androidTestImplementation 'androidx.test:runner:1.2.0'
8585
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
8686
androidTestImplementation 'junit:junit:4.12'

firebase-config/firebase-config.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ dependencies {
7474
testImplementation 'junit:junit:4.12'
7575
testImplementation "org.robolectric:robolectric:$robolectricVersion"
7676
testImplementation "org.skyscreamer:jsonassert:1.5.0"
77-
testImplementation 'androidx.test:core:1.2.0'
77+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
7878

7979
androidTestImplementation 'androidx.test:runner:1.2.0'
8080
androidTestImplementation 'org.mockito:mockito-core:2.25.0'

firebase-config/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ dependencies {
5959
testImplementation 'junit:junit:4.12'
6060
testImplementation "com.google.truth:truth:$googleTruthVersion"
6161
testImplementation 'org.mockito:mockito-core:2.25.0'
62-
testImplementation 'androidx.test:core:1.2.0'
62+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6363
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dependencies {
116116
testImplementation 'org.mockito:mockito-core:3.4.3'
117117

118118
androidTestImplementation 'androidx.test:runner:1.4.0'
119-
androidTestImplementation 'androidx.test:core:1.4.0'
119+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
120120
androidTestImplementation 'org.mockito:mockito-core:3.4.3'
121121
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
122122
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'

firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,16 @@ dependencies {
8080
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
8181

8282
testImplementation 'androidx.test:runner:1.4.0'
83-
testImplementation 'androidx.test:core:1.4.0'
83+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
8484
testImplementation "org.robolectric:robolectric:$robolectricVersion"
8585
testImplementation 'junit:junit:4.13.2'
8686
testImplementation 'org.mockito:mockito-core:3.4.3'
8787

8888

8989
androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
9090
androidTestImplementation 'androidx.test:runner:1.4.0'
91-
androidTestImplementation 'androidx.test:core:1.4.0'
92-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
91+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
92+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
9393
androidTestImplementation 'org.mockito:mockito-core:3.4.3'
9494
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
9595
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'

firebase-datatransport/firebase-datatransport.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ dependencies {
5757
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5858
testImplementation 'junit:junit:4.12'
5959
testImplementation "com.google.truth:truth:$googleTruthVersion"
60-
testImplementation 'androidx.test:core:1.2.0'
60+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6161
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ dependencies {
7474
javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
7575

7676
testImplementation 'junit:junit:4.13.2'
77-
testImplementation 'androidx.test:core:1.3.0'
77+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
7878
testImplementation 'com.android.support.test:runner:1.0.2'
7979
testImplementation 'org.mockito:mockito-core:3.3.3'
8080
testImplementation "org.robolectric:robolectric:$robolectricVersion"

firebase-dynamic-links/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ dependencies {
5656
testImplementation 'junit:junit:4.12'
5757
testImplementation "com.google.truth:truth:$googleTruthVersion"
5858
testImplementation 'org.mockito:mockito-core:2.25.0'
59-
testImplementation 'androidx.test:core:1.2.0'
59+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6060
}

firebase-firestore/firebase-firestore.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ dependencies {
145145

146146
testImplementation project(':firebase-firestore')
147147
testImplementation 'junit:junit:4.13.2'
148-
testImplementation 'androidx.test:core:1.2.0'
148+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
149149
testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
150150
testImplementation 'org.mockito:mockito-core:2.25.0'
151151
testImplementation "org.robolectric:robolectric:$robolectricVersion"
@@ -163,7 +163,7 @@ dependencies {
163163
androidTestImplementation "androidx.annotation:annotation:1.1.0"
164164
androidTestImplementation 'androidx.test:runner:1.5.2'
165165
androidTestImplementation 'androidx.test:rules:1.5.0'
166-
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
166+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
167167
}
168168

169169
gradle.projectsEvaluated {

firebase-firestore/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ dependencies {
6868
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6969
testImplementation 'junit:junit:4.12'
7070
testImplementation "com.google.truth:truth:$googleTruthVersion"
71-
testImplementation 'androidx.test:core:1.2.0'
71+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
7272
}

firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ dependencies {
102102
testImplementation "junit:junit:4.12"
103103
testImplementation "org.mockito:mockito-core:2.25.0"
104104
testImplementation "com.google.truth:truth:1.0"
105-
testImplementation 'androidx.test:core:1.2.0'
105+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
106106
testImplementation 'com.google.guava:guava:30.1-android'
107107

108108
androidTestImplementation project(':integ-testing')
109-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
109+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
110110
androidTestImplementation "androidx.annotation:annotation:1.0.0"
111111
androidTestImplementation "org.mockito:mockito-core:2.25.0"
112112
androidTestImplementation "com.google.dexmaker:dexmaker:1.2"

firebase-inappmessaging-display/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ dependencies {
6060
testImplementation ("com.google.firebase:firebase-analytics:17.0.0") {
6161
exclude group: "com.google.firebase", module: "firebase-common"
6262
}
63-
testImplementation 'androidx.test:core:1.2.0'
63+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6464
}

firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,17 +138,17 @@ dependencies {
138138
testImplementation "com.google.truth:truth:$googleTruthVersion"
139139
testImplementation 'junit:junit:4.13.1'
140140
testImplementation 'androidx.test:runner:1.3.0'
141-
testImplementation 'androidx.test.ext:junit:1.1.2'
141+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
142142
testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
143143
exclude group: 'com.google.protobuf', module: 'protobuf-java'
144144
}
145145
testImplementation "io.grpc:grpc-testing:$grpcVersion"
146146
testImplementation 'com.google.guava:guava:30.1-android'
147-
testImplementation 'androidx.test:core:1.2.0'
147+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
148148
testImplementation project(":integ-testing")
149149

150150
androidTestImplementation project(':integ-testing')
151-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
151+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
152152
androidTestImplementation "androidx.annotation:annotation:1.0.0"
153153
androidTestImplementation 'junit:junit:4.12'
154154
androidTestImplementation 'androidx.test:runner:1.2.0'

firebase-inappmessaging/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ dependencies {
5555
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5656
testImplementation 'junit:junit:4.12'
5757
testImplementation "com.google.truth:truth:$googleTruthVersion"
58-
testImplementation 'androidx.test:core:1.2.0'
58+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
5959
}

firebase-installations/firebase-installations.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ dependencies {
5656
annotationProcessor "com.google.auto.value:auto-value:1.6.2"
5757

5858
testImplementation project(':integ-testing')
59-
testImplementation 'androidx.test:core:1.2.0'
59+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6060
testImplementation 'junit:junit:4.12'
6161
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6262
testImplementation "com.google.truth:truth:$googleTruthVersion"
6363
testImplementation 'org.mockito:mockito-core:2.25.0'
6464
testImplementation 'org.mockito:mockito-inline:2.25.0'
6565

6666
androidTestImplementation project(':integ-testing')
67-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
67+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
6868
androidTestImplementation 'androidx.test:runner:1.2.0'
6969
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
7070
androidTestImplementation 'junit:junit:4.12'

firebase-installations/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ dependencies {
5353
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5454
testImplementation 'junit:junit:4.13'
5555
testImplementation "com.google.truth:truth:$googleTruthVersion"
56-
testImplementation 'androidx.test:core:1.2.0'
56+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
5757
}

firebase-messaging/firebase-messaging.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ dependencies {
105105

106106
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
107107

108-
testImplementation 'androidx.test:core:1.2.0'
108+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
109109
testImplementation 'com.google.android.gms:play-services-cloud-messaging:17.0.1'
110110
testImplementation 'androidx.test:rules:1.2.0'
111111
testImplementation 'androidx.test:runner:1.2.0'
@@ -131,7 +131,7 @@ dependencies {
131131
testImplementation 'androidx.core:core:1.6.0'
132132

133133
androidTestImplementation project(':integ-testing')
134-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
134+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
135135
androidTestImplementation 'androidx.test:runner:1.2.0'
136136
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
137137
androidTestImplementation 'junit:junit:4.12'

firebase-messaging/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ dependencies {
5353
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5454
testImplementation 'junit:junit:4.12'
5555
testImplementation "com.google.truth:truth:$googleTruthVersion"
56-
testImplementation 'androidx.test:core:1.2.0'
56+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
5757
}

firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ dependencies {
9494
annotationProcessor project(":encoders:firebase-encoders-processor")
9595

9696
testImplementation(project(":integ-testing"))
97-
testImplementation 'androidx.test:core:1.3.0'
97+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
9898
testImplementation 'com.github.tomakehurst:wiremock-standalone:2.26.3'
9999
testImplementation "com.google.truth:truth:$googleTruthVersion"
100100
testImplementation "org.robolectric:robolectric:$robolectricVersion"
@@ -109,7 +109,7 @@ dependencies {
109109
androidTestImplementation 'junit:junit:4.13.1'
110110
androidTestImplementation "androidx.annotation:annotation:1.1.0"
111111
androidTestImplementation 'androidx.test:runner:1.2.0'
112-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
112+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
113113
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
114114
}
115115

firebase-ml-modeldownloader/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ dependencies {
5454
testImplementation "com.google.truth:truth:$googleTruthVersion"
5555
testImplementation 'org.mockito:mockito-core:3.6.0'
5656
testImplementation 'androidx.test:runner:1.5.1'
57-
testImplementation 'androidx.test.ext:junit:1.1.4'
57+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
5858
}

firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
implementation 'com.google.firebase:firebase-common:20.3.1'
4646
implementation project(':firebase-ml-modeldownloader')
4747
testImplementation 'androidx.test:runner:1.2.0'
48-
testImplementation 'androidx.test.ext:junit:1.1.1'
48+
testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
4949
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5050
testImplementation 'junit:junit:4.12'
5151
testImplementation "com.google.truth:truth:$googleTruthVersion"

firebase-perf/e2e-app/e2e-app.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ dependencies {
102102

103103
// Integration Test Deps
104104
androidTestImplementation 'junit:junit:4.13.1'
105-
androidTestImplementation "androidx.test.ext:junit:1.1.2"
106-
androidTestImplementation "androidx.test:core:1.3.0"
105+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
106+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
107107
androidTestImplementation 'androidx.test:rules:1.3.0'
108108
androidTestImplementation 'androidx.test:runner:1.3.0'
109109
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

0 commit comments

Comments
 (0)