Update Firebase BOM to 28.x (#1968)

firebase · Jun 28, 2021 · 3401d5f · 3401d5f
1 parent b0877f2
commit 3401d5f
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 10 deletions.
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -25,6 +25,11 @@ android {
             consumerProguardFiles("auth-proguard.pro")
         }
     }
+
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
     lintOptions {
         // Common lint options across all modules

diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -305,11 +305,11 @@ public void testEmailBuilder_withValidActionCodeSettings_expectSuccess() {
                 .setForceSameDevice()
                 .build();
 
-        assertThat(config.getParams().getParcelable(ExtraConstants.ACTION_CODE_SETTINGS))
-                .isEqualTo(actionCodeSettings);
-        assertThat(config.getParams().getBoolean(ExtraConstants.FORCE_SAME_DEVICE))
-                .isEqualTo(true);
-        assertThat(config.getProviderId()).isEqualTo(AuthUI.EMAIL_LINK_PROVIDER);
+        assertEquals(
+                config.getParams().getParcelable(ExtraConstants.ACTION_CODE_SETTINGS),
+                actionCodeSettings);
+        assertTrue(config.getParams().getBoolean(ExtraConstants.FORCE_SAME_DEVICE));
+        assertEquals(config.getProviderId(), AuthUI.EMAIL_LINK_PROVIDER);
 
     }
 

diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
@@ -152,7 +152,7 @@ public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure()
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zzb(credential);
+        collisionException.zzb(EMAIL).zza(credential);
 
         when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -256,7 +256,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zzb(credential);
+        collisionException.zzb(EMAIL).zza(credential);
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -300,7 +300,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLi
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zzb(credential);
+        collisionException.zzb(EMAIL).zza(credential);
 
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))

diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
@@ -36,6 +36,7 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
@@ -58,7 +59,7 @@ public class PhoneProviderResponseHandlerTest {
     public void setUp() {
         TestHelper.initialize();
         MockitoAnnotations.initMocks(this);
-        mCredential = PhoneAuthCredential.zzb("sessionInfo", "SmsCode");
+        mCredential = PhoneAuthCredential.zzc("sessionInfo", "SmsCode");
 
         mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -45,7 +45,7 @@ object Config {
         }
 
         object Firebase {
-            const val bom = "com.google.firebase:firebase-bom:26.8.0"
+            const val bom = "com.google.firebase:firebase-bom:28.2.0"
             const val auth = "com.google.firebase:firebase-auth"
             const val database = "com.google.firebase:firebase-database"
             const val firestore = "com.google.firebase:firebase-firestore"

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -17,6 +17,11 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(

diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -19,6 +19,11 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(

diff --git a/internal/lintchecks/build.gradle.kts b/internal/lintchecks/build.gradle.kts
@@ -18,6 +18,11 @@ android {
         multiDexEnabled = true
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -17,6 +17,11 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(

diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
@@ -40,6 +40,11 @@ android {
         }
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(

diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
@@ -17,6 +17,11 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
+    compileOptions {    
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
         // Common lint options across all modules
         disable(