Merge branch 'master' of github.com:firebase/FirebaseUI-Android into …

…version-8.1.0-dev

� Conflicts:
�	buildSrc/src/main/kotlin/Config.kt

README.md

@@ -48,16 +48,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:8.0.1'
+    implementation 'com.firebaseui:firebase-ui-database:8.0.2'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:8.0.1'
+    implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.1'
+    implementation 'com.firebaseui:firebase-ui-auth:8.0.2'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:8.0.1'
+    implementation 'com.firebaseui:firebase-ui-storage:8.0.2'
 }
 ```
 

app/build.gradle.kts

@@ -39,7 +39,8 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
@@ -49,13 +50,13 @@ android {
         )
 
         // Module-specific
-        disable("ResourceName", "MissingTranslation", "DuplicateStrings")
+        disable += mutableSetOf("ResourceName", "MissingTranslation", "DuplicateStrings")
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     compileOptions {

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
         android:usesCleartextTraffic="true">
 
         <activity android:name=".ChooserActivity"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

auth/README.md

@@ -65,7 +65,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.1'
+    implementation 'com.firebaseui:firebase-ui-auth:8.0.2'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md

auth/build.gradle.kts

@@ -32,15 +32,15 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
         // Module specific
-        disable(
+        disable += mutableSetOf(
             "UnusedQuantity",
             "UnknownNullness",  // TODO fix in future PR
             "TypographyQuotes", // Straight versus directional quotes
@@ -50,11 +50,11 @@ android {
             "VectorPath"
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     testOptions {

auth/src/main/AndroidManifest.xml

@@ -7,6 +7,16 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <!-- Used to check if a browser is available before launching phone auth -->
+    <!-- See ui/phone/PhoneNumberVerificationHandler.isBrowserAvailable() -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="http" />
+        </intent>
+    </queries>
+
     <application>
 
         <meta-data

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java

@@ -2,8 +2,10 @@
 
 import android.app.Activity;
 import android.app.Application;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
-
 import com.firebase.ui.auth.data.model.PhoneNumberVerificationRequiredException;
 import com.firebase.ui.auth.data.model.Resource;
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
@@ -58,7 +60,11 @@ public void onCodeSent(@NonNull String verificationId,
         if (force) {
             optionsBuilder.setForceResendingToken(mForceResendingToken);
         }
-        PhoneAuthProvider.verifyPhoneNumber(optionsBuilder.build());
+        if (isBrowserAvailable(activity)) {
+            PhoneAuthProvider.verifyPhoneNumber(optionsBuilder.build());
+        } else {
+            setResult(Resource.forFailure(new ActivityNotFoundException("No browser was found in this device")));
+        }
     }
 
     public void submitVerificationCode(String number, String code) {
@@ -77,4 +83,9 @@ public void onRestoreInstanceState(@Nullable Bundle savedInstanceState) {
             mVerificationId = savedInstanceState.getString(VERIFICATION_ID_KEY);
         }
     }
+
+    private boolean isBrowserAvailable(Activity activity) {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"));
+        return browserIntent.resolveActivity(activity.getPackageManager()) != null;
+    }
 }

buildSrc/src/main/kotlin/Config.kt

@@ -2,7 +2,7 @@ object Config {
     const val version = "8.1.0-SNAPSHOT"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
-    private const val kotlinVersion = "1.3.72"
+    private const val kotlinVersion = "1.7.10"
 
     object SdkVersions {
         const val compile = 29
@@ -11,7 +11,7 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:7.0.0"
+        const val android = "com.android.tools.build:gradle:7.2.2"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.3.8"
 
@@ -53,7 +53,7 @@ object Config {
         }
 
         object PlayServices {
-            const val auth = "com.google.android.gms:play-services-auth:19.0.0"
+            const val auth = "com.google.android.gms:play-services-auth:20.3.0"
         }
 
         object Provider {

common/build.gradle.kts

@@ -21,18 +21,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {

database/build.gradle.kts

@@ -23,18 +23,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {

firestore/build.gradle.kts

@@ -19,18 +19,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     buildTypes {

firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java

@@ -43,12 +43,11 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         PageKey key = (PageKey) o;
-        if (mStartAfter == null && key.mStartAfter == null)
+        if (mStartAfter == null && key.mStartAfter == null &&
+                mEndBefore == null && key.mEndBefore == null)
             return true;
-        if (mEndBefore == null && key.mEndBefore == null)
-            return true;
-        return mStartAfter.getId() == key.mStartAfter.getId() &&
-                mEndBefore.getId() == key.mEndBefore.getId();
+        return mStartAfter.getId().equals(key.mStartAfter.getId()) &&
+                mEndBefore.getId().equals(key.mEndBefore.getId());
     }
 
     @Override

gradle.properties

@@ -4,9 +4,15 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=false
 
 GROUP=com.firebaseui
-VERSION_NAME=8.0.1
+VERSION_NAME=8.0.2
 
 POM_PACKAGING=aar
 POM_DESCRIPTION=FirebaseUI for Android

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

internal/lintchecks/build.gradle.kts

@@ -22,18 +22,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 }
 

library/build.gradle.kts

@@ -21,18 +21,18 @@ android {
 
     lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor" // We almost never care about this
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = false // Override
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = false // Override
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 }
 

proguard-tests/build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
 val inCiBuild = System.getenv("CI") == "true"
 
 android {
-    compileSdkVersion(Config.SdkVersions.compile)
+    compileSdk = Config.SdkVersions.compile
 
     defaultConfig {
-        minSdkVersion(Config.SdkVersions.min)
-        targetSdkVersion(Config.SdkVersions.target)
+        minSdk = Config.SdkVersions.min
+        targetSdk = Config.SdkVersions.target
 
         versionName = Config.version
         versionCode = 1
@@ -45,21 +45,21 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    lint {
         // Common lint options across all modules
-        disable(
+        disable += mutableSetOf(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
             "SelectableText", "SyntheticAccessor", // We almost never care about this
             "MediaCapabilities"
         )
 
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
-        isAbortOnError = true
+        checkAllWarnings = true
+        warningsAsErrors = true
+        abortOnError = true
 
-        baselineFile = file("$rootDir/library/quality/lint-baseline.xml")
+        baseline = file("$rootDir/library/quality/lint-baseline.xml")
     }
 
     variantFilter {