upgrade to AGP7 (firebase#1979)

Author: thatfiredev

.github/workflows/android.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Gradle
       run: ./scripts/build.sh
     - name: Print Logs

app/build.gradle.kts

@@ -5,11 +5,11 @@ plugins {
 }
 
 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
@@ -37,13 +37,15 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         // Common lint options across all modules
         disable(
             "IconExpectedSize",
             "InvalidPackage", // Firestore uses GRPC which makes lint mad
             "NewerVersionAvailable", "GradleDependency", // For reproducible builds
-            "SelectableText", "SyntheticAccessor" // We almost never care about this
+            "SelectableText", "SyntheticAccessor", // We almost never care about this
+            "UnusedIds", "MediaCapabilities" // TODO(rosariopfernandes): remove this once we confirm
+            // it builds successfully
         )
 
         // Module-specific

app/src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
         android:usesCleartextTraffic="true">
 
-        <activity android:name=".ChooserActivity">
+        <activity android:name=".ChooserActivity"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/res/values/colors.xml

@@ -1,6 +1,5 @@
 <resources>
     <color name="colorPrimary">#039BE5</color>
-    <color name="colorPrimaryDark">#0288D1</color>
     <color name="colorPrimaryVariant">#0288D1</color>
     <color name="colorSecondary">#FFA000</color>
 
@@ -14,7 +13,6 @@
     <color name="material_gray_300">#E0E0E0</color>
     <color name="material_gray_500">#9e9e9e</color>
 
-    <color name="material_lime_a700">#AEEA00</color>
     <color name="material_red_a200">#FF5252</color>
 
 </resources>

auth/build.gradle.kts

@@ -6,14 +6,13 @@ plugins {
 }
 
 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
+        buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
         resourcePrefix("fui_")
         vectorDrawables.useSupportLibrary = true
@@ -31,7 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
+    lint {
         // Common lint options across all modules
         disable(
             "IconExpectedSize",
@@ -59,9 +58,9 @@ android {
     }
 
     testOptions {
-        unitTests(closureOf<TestOptions.UnitTestOptions> {
+        unitTests {
             isIncludeAndroidResources = true
-        })
+        }
     }
 }
 

auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -123,7 +124,9 @@ public static IdpResponse from(@NonNull Exception e) {
         } else if (e instanceof FirebaseUiUserCollisionException) {
             FirebaseUiUserCollisionException collisionException
                     = (FirebaseUiUserCollisionException) e;
-            User user = new User.Builder(
+            // Lint complains about providerId not being
+            // in the pre-defined set of constants
+            @SuppressLint("WrongConstant") User user = new User.Builder(
                     collisionException.getProviderId(),
                     collisionException.getEmail())
                     .build();

auth/src/main/res/layout/fui_check_email_layout.xml

@@ -18,7 +18,6 @@
 
         <LinearLayout
             style="@style/FirebaseUI.WrapperStyle"
-            android:id="@+id/email_top_layout"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 

auth/src/main/res/layout/fui_email_link_sign_in_layout.xml

@@ -24,7 +24,6 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/sign_in_email_sent_header_text"
                 style="@style/FirebaseUI.Text.Heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

auth/src/main/res/layout/fui_email_link_trouble_signing_in_layout.xml

@@ -30,7 +30,6 @@
                 android:text="@string/fui_email_link_trouble_getting_email_header" />
 
             <TextView
-                android:id="@+id/trouble_signing_in_possible_fixes"
                 style="@style/FirebaseUI.Text.BodyText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

auth/src/main/res/layout/fui_idp_button_apple.xml

@@ -1,4 +1,3 @@
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/apple_signin_button"
     style="@style/FirebaseUI.Button.AccountChooser.AppleButton"
     android:text="@string/fui_sign_in_with_apple"/>