Skip to content

Commit 3401d5f

Browse files
authored
Update Firebase BOM to 28.x (#1968)
1 parent b0877f2 commit 3401d5f

File tree

11 files changed

+46
-10
lines changed

11 files changed

+46
-10
lines changed

auth/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ android {
2525
consumerProguardFiles("auth-proguard.pro")
2626
}
2727
}
28+
29+
compileOptions {
30+
sourceCompatibility = JavaVersion.VERSION_1_8
31+
targetCompatibility = JavaVersion.VERSION_1_8
32+
}
2833

2934
lintOptions {
3035
// Common lint options across all modules

auth/src/test/java/com/firebase/ui/auth/AuthUITest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,11 @@ public void testEmailBuilder_withValidActionCodeSettings_expectSuccess() {
305305
.setForceSameDevice()
306306
.build();
307307

308-
assertThat(config.getParams().getParcelable(ExtraConstants.ACTION_CODE_SETTINGS))
309-
.isEqualTo(actionCodeSettings);
310-
assertThat(config.getParams().getBoolean(ExtraConstants.FORCE_SAME_DEVICE))
311-
.isEqualTo(true);
312-
assertThat(config.getProviderId()).isEqualTo(AuthUI.EMAIL_LINK_PROVIDER);
308+
assertEquals(
309+
config.getParams().getParcelable(ExtraConstants.ACTION_CODE_SETTINGS),
310+
actionCodeSettings);
311+
assertTrue(config.getParams().getBoolean(ExtraConstants.FORCE_SAME_DEVICE));
312+
assertEquals(config.getProviderId(), AuthUI.EMAIL_LINK_PROVIDER);
313313

314314
}
315315

auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure()
152152
.build();
153153
FirebaseAuthUserCollisionException collisionException
154154
= new FirebaseAuthUserCollisionException("foo", "bar");
155-
collisionException.zza(EMAIL).zzb(credential);
155+
collisionException.zzb(EMAIL).zza(credential);
156156

157157
when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
158158
.thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -256,7 +256,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
256256
.build();
257257
FirebaseAuthUserCollisionException collisionException
258258
= new FirebaseAuthUserCollisionException("foo", "bar");
259-
collisionException.zza(EMAIL).zzb(credential);
259+
collisionException.zzb(EMAIL).zza(credential);
260260
when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
261261
any(Activity.class), any(OAuthProvider.class)))
262262
.thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -300,7 +300,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLi
300300
.build();
301301
FirebaseAuthUserCollisionException collisionException
302302
= new FirebaseAuthUserCollisionException("foo", "bar");
303-
collisionException.zza(EMAIL).zzb(credential);
303+
collisionException.zzb(EMAIL).zza(credential);
304304

305305
when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
306306
any(Activity.class), any(OAuthProvider.class)))

auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import androidx.test.core.app.ApplicationProvider;
3737

3838
import static com.google.common.truth.Truth.assertThat;
39+
import static org.mockito.ArgumentMatchers.any;
3940
import static org.mockito.ArgumentMatchers.argThat;
4041
import static org.mockito.Mockito.inOrder;
4142
import static org.mockito.Mockito.verify;
@@ -58,7 +59,7 @@ public class PhoneProviderResponseHandlerTest {
5859
public void setUp() {
5960
TestHelper.initialize();
6061
MockitoAnnotations.initMocks(this);
61-
mCredential = PhoneAuthCredential.zzb("sessionInfo", "SmsCode");
62+
mCredential = PhoneAuthCredential.zzc("sessionInfo", "SmsCode");
6263

6364
mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
6465
FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(

buildSrc/src/main/kotlin/Config.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object Config {
4545
}
4646

4747
object Firebase {
48-
const val bom = "com.google.firebase:firebase-bom:26.8.0"
48+
const val bom = "com.google.firebase:firebase-bom:28.2.0"
4949
const val auth = "com.google.firebase:firebase-auth"
5050
const val database = "com.google.firebase:firebase-database"
5151
const val firestore = "com.google.firebase:firebase-firestore"

common/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ android {
1717
vectorDrawables.useSupportLibrary = true
1818
}
1919

20+
compileOptions {
21+
sourceCompatibility = JavaVersion.VERSION_1_8
22+
targetCompatibility = JavaVersion.VERSION_1_8
23+
}
24+
2025
lintOptions {
2126
// Common lint options across all modules
2227
disable(

database/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ android {
1919
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2020
}
2121

22+
compileOptions {
23+
sourceCompatibility = JavaVersion.VERSION_1_8
24+
targetCompatibility = JavaVersion.VERSION_1_8
25+
}
26+
2227
lintOptions {
2328
// Common lint options across all modules
2429
disable(

internal/lintchecks/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ android {
1818
multiDexEnabled = true
1919
}
2020

21+
compileOptions {
22+
sourceCompatibility = JavaVersion.VERSION_1_8
23+
targetCompatibility = JavaVersion.VERSION_1_8
24+
}
25+
2126
lintOptions {
2227
// Common lint options across all modules
2328
disable(

library/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ android {
1717
vectorDrawables.useSupportLibrary = true
1818
}
1919

20+
compileOptions {
21+
sourceCompatibility = JavaVersion.VERSION_1_8
22+
targetCompatibility = JavaVersion.VERSION_1_8
23+
}
24+
2025
lintOptions {
2126
// Common lint options across all modules
2227
disable(

proguard-tests/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ android {
4040
}
4141
}
4242

43+
compileOptions {
44+
sourceCompatibility = JavaVersion.VERSION_1_8
45+
targetCompatibility = JavaVersion.VERSION_1_8
46+
}
47+
4348
lintOptions {
4449
// Common lint options across all modules
4550
disable(

storage/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ android {
1717
vectorDrawables.useSupportLibrary = true
1818
}
1919

20+
compileOptions {
21+
sourceCompatibility = JavaVersion.VERSION_1_8
22+
targetCompatibility = JavaVersion.VERSION_1_8
23+
}
24+
2025
lintOptions {
2126
// Common lint options across all modules
2227
disable(

0 commit comments

Comments
 (0)