Skip to content

Commit ec68af6

Browse files
mrobermrober
authored
Upgrade Crashlytics dep versions (#6083)
Update Crashlytics and AQS dep versions. Fixed some of the tests because of changes to Mockito. The Mockito version in the Android tests is still pinned a bit old, because after that version a lot more things break.
1 parent d48cb12 commit ec68af6

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,47 +62,47 @@ thirdPartyLicenses {
6262
}
6363

6464
dependencies {
65-
javadocClasspath 'com.google.code.findbugs:jsr305:3.0.2'
65+
javadocClasspath(libs.findbugs.jsr305)
6666

6767
api(project(":firebase-sessions"))
68-
api "com.google.android.gms:play-services-tasks:18.0.1"
69-
api 'com.google.firebase:firebase-annotations:16.2.0'
68+
api(libs.playservices.tasks)
69+
api("com.google.firebase:firebase-annotations:16.2.0")
7070
api("com.google.firebase:firebase-common:21.0.0")
7171
api("com.google.firebase:firebase-common-ktx:21.0.0")
7272
api("com.google.firebase:firebase-components:18.0.0")
73-
api 'com.google.firebase:firebase-config-interop:16.0.0'
74-
api 'com.google.firebase:firebase-encoders:17.0.0'
75-
api 'com.google.firebase:firebase-encoders-json:18.0.0'
76-
api("com.google.firebase:firebase-installations:17.2.0")
77-
api 'com.google.firebase:firebase-installations-interop:17.1.0'
73+
api("com.google.firebase:firebase-config-interop:16.0.1")
74+
api("com.google.firebase:firebase-encoders:17.0.0")
75+
api("com.google.firebase:firebase-encoders-json:18.0.1")
76+
api("com.google.firebase:firebase-installations:18.0.0")
77+
api("com.google.firebase:firebase-installations-interop:17.2.0")
7878
api("com.google.firebase:firebase-measurement-connector:20.0.1")
7979

80-
implementation 'com.google.android.datatransport:transport-api:3.0.0'
81-
implementation 'com.google.android.datatransport:transport-backend-cct:3.1.9'
82-
implementation 'com.google.android.datatransport:transport-runtime:3.1.9'
80+
implementation("com.google.android.datatransport:transport-api:3.2.0")
81+
implementation("com.google.android.datatransport:transport-backend-cct:3.3.0")
82+
implementation("com.google.android.datatransport:transport-runtime:3.3.0")
8383
implementation(libs.androidx.annotation)
8484
compileOnly(libs.errorprone.annotations)
8585

86-
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
86+
compileOnly(libs.autovalue.annotations)
8787

88-
annotationProcessor project(":encoders:firebase-encoders-processor")
89-
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
88+
annotationProcessor(project(":encoders:firebase-encoders-processor"))
89+
annotationProcessor(libs.autovalue)
9090

91-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
92-
testImplementation 'androidx.test:runner:1.4.0'
93-
testImplementation 'junit:junit:4.13.2'
94-
testImplementation 'org.mockito:mockito-core:3.4.3'
95-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
91+
testImplementation(libs.androidx.test.core)
92+
testImplementation(libs.androidx.test.runner)
93+
testImplementation(libs.junit)
94+
testImplementation(libs.mockito.core)
95+
testImplementation(libs.robolectric)
9696

97-
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
98-
androidTestImplementation 'androidx.test:runner:1.4.0'
99-
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
100-
androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
101-
androidTestImplementation 'com.google.protobuf:protobuf-java:3.21.9'
102-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
103-
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
104-
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.1'
105-
androidTestImplementation 'org.mockito:mockito-core:3.4.3'
97+
androidTestImplementation(libs.androidx.test.core)
98+
androidTestImplementation(libs.androidx.test.runner)
99+
androidTestImplementation(libs.androidx.test.junit)
100+
androidTestImplementation("com.google.firebase:firebase-encoders-json:18.0.1")
101+
androidTestImplementation("com.google.protobuf:protobuf-java:3.21.11")
102+
androidTestImplementation(libs.truth)
103+
androidTestImplementation("com.linkedin.dexmaker:dexmaker:2.28.3")
104+
androidTestImplementation(libs.mockito.dexmaker)
105+
androidTestImplementation("org.mockito:mockito-core:4.7.0")
106106
androidTestImplementation(libs.androidx.test.junit)
107107
androidTestImplementation(libs.androidx.test.runner)
108108
androidTestImplementation(libs.truth)

‎firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/RemoteConfigDeferredProxyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package com.google.firebase.crashlytics.internal;
1616

17-
import static org.mockito.ArgumentMatchers.anyObject;
17+
import static org.mockito.ArgumentMatchers.any;
1818
import static org.mockito.ArgumentMatchers.eq;
1919
import static org.mockito.Mockito.verify;
2020

@@ -50,6 +50,6 @@ public void whenAvailable(
5050
}
5151
});
5252
proxy.setupListener(userMetadata);
53-
verify(interop).registerRolloutsStateSubscriber(eq("firebase"), anyObject());
53+
verify(interop).registerRolloutsStateSubscriber(eq("firebase"), any());
5454
}
5555
}

‎firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CommonUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
package com.google.firebase.crashlytics.internal.common;
1616

17-
import static org.mockito.Matchers.anyString;
18-
import static org.mockito.Matchers.eq;
17+
import static org.mockito.ArgumentMatchers.anyString;
18+
import static org.mockito.ArgumentMatchers.eq;
1919
import static org.mockito.Mockito.mock;
2020
import static org.mockito.Mockito.when;
2121

‎firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/DefaultSettingsControllerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.mockito.Mockito.mock;
2020
import static org.mockito.Mockito.times;
2121
import static org.mockito.Mockito.verify;
22-
import static org.mockito.Mockito.verifyZeroInteractions;
22+
import static org.mockito.Mockito.verifyNoMoreInteractions;
2323
import static org.mockito.Mockito.when;
2424

2525
import com.google.android.gms.tasks.Task;
@@ -124,7 +124,7 @@ public void testCachedSettingsLoad() throws Exception {
124124
await(controller.loadSettingsData(networkExecutor));
125125
assertEquals(cachedSettings, controller.getSettingsSync());
126126

127-
verifyZeroInteractions(mockSettingsSpiCall);
127+
verifyNoMoreInteractions(mockSettingsSpiCall);
128128
verify(mockCachedSettingsIo).readCachedSettings();
129129
verify(mockSettingsJsonParser).parseSettingsJson(cachedJson);
130130
verify(mockCurrentTimeProvider, times(2)).getCurrentTimeMillis();
@@ -239,7 +239,7 @@ public void testIgnoreExpiredCachedSettingsLoad() throws Exception {
239239
controller.loadSettingsData(SettingsCacheBehavior.IGNORE_CACHE_EXPIRATION, networkExecutor);
240240
assertEquals(cachedSettings, controller.getSettingsSync());
241241

242-
verifyZeroInteractions(mockSettingsSpiCall);
242+
verifyNoMoreInteractions(mockSettingsSpiCall);
243243
verify(mockCachedSettingsIo).readCachedSettings();
244244
verify(mockSettingsJsonParser).parseSettingsJson(cachedJson);
245245
verify(mockCurrentTimeProvider, times(2)).getCurrentTimeMillis();
@@ -376,7 +376,7 @@ public void testNoAvailableSettingsLoad() throws Exception {
376376

377377
verify(mockSettingsSpiCall).invoke(any(SettingsRequest.class), eq(true));
378378
verify(mockCachedSettingsIo, times(2)).readCachedSettings();
379-
verifyZeroInteractions(mockSettingsJsonParser);
379+
verifyNoMoreInteractions(mockSettingsJsonParser);
380380
verify(mockCurrentTimeProvider).getCurrentTimeMillis();
381381
}
382382

‎firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ dependencies {
6161
api("com.google.firebase:firebase-common-ktx:21.0.0")
6262

6363
api("com.google.firebase:firebase-components:18.0.0")
64-
api("com.google.firebase:firebase-installations-interop:17.1.1") {
64+
api("com.google.firebase:firebase-installations-interop:17.2.0") {
6565
exclude(group = "com.google.firebase", module = "firebase-common")
6666
exclude(group = "com.google.firebase", module = "firebase-components")
6767
}
6868
implementation("androidx.datastore:datastore-preferences:1.0.0")
69-
implementation("com.google.android.datatransport:transport-api:3.0.0")
69+
implementation("com.google.android.datatransport:transport-api:3.2.0")
7070
api("com.google.firebase:firebase-annotations:16.2.0")
7171
api("com.google.firebase:firebase-encoders:17.0.0")
7272
api("com.google.firebase:firebase-encoders-json:18.0.1")
7373
implementation(libs.androidx.annotation)
7474
compileOnly(libs.errorprone.annotations)
7575

76-
runtimeOnly("com.google.firebase:firebase-installations:17.2.0") {
76+
runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
7777
exclude(group = "com.google.firebase", module = "firebase-common")
7878
exclude(group = "com.google.firebase", module = "firebase-components")
7979
}
80-
runtimeOnly("com.google.firebase:firebase-datatransport:18.1.8") {
80+
runtimeOnly("com.google.firebase:firebase-datatransport:19.0.0") {
8181
exclude(group = "com.google.firebase", module = "firebase-common")
8282
exclude(group = "com.google.firebase", module = "firebase-components")
8383
}

0 commit comments

Comments
 (0)