Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ apply from: "gradle/errorProne.gradle"
ext {
playServicesVersion = '16.0.1'
supportAnnotationsVersion = '28.0.0'
googleTruthVersion = '0.45'
grpcVersion = '1.41.0'
googleTruthVersion = '1.1.2'
grpcVersion = '1.44.1'
robolectricVersion = '4.3.1'
protocVersion = '3.14.0'
javaliteVersion = '3.14.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private void testNullCompare(Object obj) {
if (comparator == null) {
try {
compare(obj, null);
assert_().fail("Expected NullPointerException in %s.compare(null)", obj);
assert_().withMessage("Expected NullPointerException in %s.compare(null)", obj).fail();
} catch (NullPointerException expected) {
// TODO: Consider accepting JavaScriptException under GWT
}
Expand All @@ -192,7 +192,9 @@ private void testClassCast(Object obj) {
if (comparator == null) {
try {
compare(obj, ICanNotBeCompared.INSTANCE);
assert_().fail("Expected ClassCastException in %s.compareTo(otherObject)", obj);
assert_()
.withMessage("Expected ClassCastException in %s.compareTo(otherObject)", obj)
.fail();
} catch (ClassCastException expected) {
}
}
Expand Down
2 changes: 2 additions & 0 deletions firebase-firestore/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ by opting into a release at
[go/firebase-android-release](http:go/firebase-android-release) (Googlers only).

# 24.0.2
- [fixed] Fixed an issue of long grpc reconnection period, when App moves to
foreground after staying in background for a while.
- [fixed] Fixed an AppCheck issue that caused Firestore listeners to stop
working and receive a "Permission Denied" error. This issue only occurred for
AppCheck users that set their expiration time to under an hour.
Expand Down
2 changes: 1 addition & 1 deletion firebase-firestore/firebase-firestore.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ configurations.all {
if(it.name.contains('AndroidTestRuntimeClasspath')) {
it.resolutionStrategy {
force 'org.checkerframework:checker-compat-qual:2.5.5'
force 'com.google.guava:guava:30.1-android'
force 'com.google.guava:guava:30.1.1-android'
}
}
exclude group: "com.google.protobuf", module: "protobuf-java"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private void testNullCompare(Object obj) {
if (comparator == null) {
try {
compare(obj, null);
assert_().fail("Expected NullPointerException in %s.compare(null)", obj);
assert_().withMessage("Expected NullPointerException in %s.compare(null)", obj).fail();
} catch (NullPointerException expected) {
// TODO(cpovirk): Consider accepting JavaScriptException under GWT
}
Expand All @@ -196,7 +196,9 @@ private void testClassCast(Object obj) {
if (comparator == null) {
try {
compare(obj, ICanNotBeCompared.INSTANCE);
assert_().fail("Expected ClassCastException in %s.compareTo(otherObject)", obj);
assert_()
.withMessage("Expected ClassCastException in %s.compareTo(otherObject)", obj)
.fail();
} catch (ClassCastException expected) {
}
}
Expand Down
4 changes: 2 additions & 2 deletions firebase-inappmessaging/firebase-inappmessaging.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ configurations.all {
if(it.name.contains('AndroidTestRuntimeClasspath')) {
it.resolutionStrategy {
force 'org.checkerframework:checker-compat-qual:2.5.5'
force 'com.google.guava:guava:30.1-android'
force 'com.google.guava:guava:30.1.1-android'
}
}
}
Expand Down Expand Up @@ -129,7 +129,7 @@ dependencies {
implementation "io.grpc:grpc-okhttp:$grpcVersion"
implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
implementation 'com.google.auto.value:auto-value-annotations:1.8.1'

implementation('com.google.firebase:firebase-measurement-connector:18.0.2') {
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand Down
2 changes: 1 addition & 1 deletion firebase-messaging/firebase-messaging.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ dependencies {
testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
testImplementation 'androidx.test:rules:1.2.0'
testImplementation 'androidx.test.ext:truth:1.2.0'
testImplementation 'androidx.test.ext:truth:1.4.0'
testImplementation 'androidx.test.services:test-services:1.2.0'
testImplementation 'androidx.core:core:1.6.0'
}
2 changes: 1 addition & 1 deletion firebase-perf/e2e-app/e2e-app.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ dependencies {

// Google Deps
implementation "com.google.android.gms:play-services-tasks:18.0.1"
implementation "com.google.guava:guava:29.0-android"
implementation "com.google.guava:guava:30.1.1-android"
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation "androidx.recyclerview:recyclerview:1.1.0"
Expand Down