Merge branch 'version-9.0.0-dev' into rpf-init-v9.0.0

Author: thatfiredev

.github/workflows/android.yml

@@ -8,13 +8,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Gradle
-      run: ./scripts/build.sh
-    - name: Print Logs
-      if: failure()
-      run: ./scripts/print_build_logs.sh
+      - uses: actions/checkout@v2
+      - name: set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Build with Gradle
+        run: ./scripts/build.sh
+      - name: Print Logs
+        if: failure()
+        run: ./scripts/print_build_logs.sh

app/build.gradle.kts

@@ -7,6 +7,8 @@ plugins {
 android {
     compileSdk = Config.SdkVersions.compile
 
+    namespace = "com.firebase.uidemo"
+
     defaultConfig {
         minSdk = Config.SdkVersions.min
         targetSdk = Config.SdkVersions.target
@@ -60,8 +62,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -95,9 +97,6 @@ dependencies {
     implementation(Config.Libs.Misc.permissions)
     implementation(Config.Libs.Androidx.constraint)
     debugImplementation(Config.Libs.Misc.leakCanary)
-    debugImplementation(Config.Libs.Misc.leakCanaryFragments)
-    releaseImplementation(Config.Libs.Misc.leakCanaryNoop)
-    testImplementation(Config.Libs.Misc.leakCanaryNoop)
 }
 
 apply(plugin = "com.google.gms.google-services")

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.firebase.uidemo">
+    >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

app/src/main/java/com/firebase/uidemo/FirebaseUIDemo.java

@@ -1,23 +1,10 @@
 package com.firebase.uidemo;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
 
 public class FirebaseUIDemo extends MultiDexApplication {
     static {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
     }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        LeakCanary.install(this);
-    }
 }

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -141,8 +141,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
         mBinding.signIn.setOnClickListener(view -> signIn());
 
-        mBinding.signInSilent.setOnClickListener(view -> silentSignIn());
-
         if (ConfigurationUtils.isGoogleMisconfigured(this)
                 || ConfigurationUtils.isFacebookMisconfigured(this)) {
             showSnackbar(R.string.configuration_required);
@@ -226,18 +224,9 @@ private Intent getSignInIntent(@Nullable String link) {
         if (auth.getCurrentUser() != null && auth.getCurrentUser().isAnonymous()) {
             builder.enableAnonymousUsersAutoUpgrade();
         }
-        return builder.build();
-    }
 
-    public void silentSignIn() {
-        getAuthUI().silentSignIn(this, getSelectedProviders())
-                .addOnCompleteListener(this, task -> {
-                    if (task.isSuccessful()) {
-                        startSignedInActivity(null);
-                    } else {
-                        showSnackbar(R.string.sign_in_failed);
-                    }
-                });
+        builder.setAlwaysShowSignInMethodScreen(true);
+        return builder.build();
     }
 
     @Override

app/src/main/res/layout/auth_ui_layout.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
@@ -27,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/launch_title"
-                app:drawableTopCompat="@drawable/firebase_auth_120dp"/>
+                app:drawableTopCompat="@drawable/firebase_auth_120dp" />
 
             <Button
                 android:id="@+id/sign_in"
@@ -38,15 +39,6 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/sign_in_start" />
 
-            <Button
-                android:id="@+id/sign_in_silent"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="16dp"
-                android:text="@string/sign_in_silent" />
-
             <TextView
                 style="@style/TextAppearance.MaterialComponents.Subtitle1"
                 android:layout_width="wrap_content"
@@ -352,4 +344,4 @@
 
     </ScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

auth/build.gradle.kts

@@ -1,12 +1,14 @@
 import com.android.build.gradle.internal.dsl.TestOptions
 
 plugins {
-  id("com.android.library")
-  id("com.vanniktech.maven.publish")
+    id("com.android.library")
+    id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.android")
 }
 
 android {
     compileSdk = Config.SdkVersions.compile
+    namespace = "com.firebase.ui.auth"
 
     defaultConfig {
         minSdk = Config.SdkVersions.min
@@ -26,8 +28,8 @@ android {
     }
 
     compileOptions {    
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     lint {
@@ -62,6 +64,9 @@ android {
             isIncludeAndroidResources = true
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {
@@ -72,8 +77,11 @@ dependencies {
     implementation(Config.Libs.Androidx.fragment)
     implementation(Config.Libs.Androidx.customTabs)
     implementation(Config.Libs.Androidx.constraint)
+    implementation("androidx.credentials:credentials:1.3.0")
 
     implementation(Config.Libs.Androidx.lifecycleExtensions)
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0")
     annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 
     implementation(platform(Config.Libs.Firebase.bom))

auth/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.firebase.ui.auth">
+    >
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />