Android Arch --> AndroidX (#1682)

Author: samtstern

app/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     annotationProcessor(Config.Libs.Misc.glideCompiler)
 
     // Used for FirestorePagingActivity
-    implementation(Config.Libs.Arch.paging)
+    implementation(Config.Libs.Androidx.paging)
 
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for

auth/build.gradle.kts

@@ -28,8 +28,8 @@ dependencies {
     implementation(Config.Libs.Androidx.constraint)
     implementation(Config.Libs.Misc.materialProgress)
 
-    implementation(Config.Libs.Arch.extensions)
-    annotationProcessor(Config.Libs.Arch.compiler)
+    implementation(Config.Libs.Androidx.lifecycleExtensions)
+    annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 
     api(Config.Libs.Firebase.auth)
     api(Config.Libs.PlayServices.auth)

buildSrc/src/main/kotlin/Config.kt

@@ -30,39 +30,30 @@ object Config {
             const val customTabs = "androidx.browser:browser:1.0.0"
             const val cardView = "androidx.cardview:cardview:1.0.0"
             const val constraint = "androidx.constraintlayout:constraintlayout:1.1.3"
+            const val lifecycleCompiler = "androidx.lifecycle:lifecycle-compiler:2.1.0"
+            const val lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:2.1.0"
+            const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime:2.1.0"
+            const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel:2.1.0"
             const val legacySupportv4 = "androidx.legacy:legacy-support-v4:1.0.0"
             const val multidex = "androidx.multidex:multidex:2.0.1"
+            const val paging = "androidx.paging:paging-runtime:2.1.0"
             const val recyclerView = "androidx.recyclerview:recyclerview:1.0.0"
 
             const val design = "com.google.android.material:material:1.0.0"
         }
 
-        object Arch {
-            private const val version = "1.1.1"
-
-            const val runtime = "android.arch.lifecycle:runtime:$version"
-            const val viewModel = "android.arch.lifecycle:viewmodel:$version"
-            const val extensions = "android.arch.lifecycle:extensions:$version"
-            const val compiler = "android.arch.lifecycle:compiler:$version"
-
-            const val paging = "android.arch.paging:runtime:1.0.1"
-
-            const val coreTesting = "android.arch.core:core-testing:1.1.1"
-        }
-
         object Firebase {
             const val auth = "com.google.firebase:firebase-auth:19.0.0"
             const val core = "com.google.firebase:firebase-core:17.2.0"
             const val database = "com.google.firebase:firebase-database:19.1.0"
-            const val firestore = "com.google.firebase:firebase-firestore:21.1.0"
+            const val firestore = "com.google.firebase:firebase-firestore:21.1.1"
             const val storage = "com.google.firebase:firebase-storage:19.0.1"
         }
 
         object PlayServices {
             const val auth = "com.google.android.gms:play-services-auth:17.0.0"
         }
 
-
         object Provider {
             const val facebook = "com.facebook.android:facebook-login:4.38.1"
             // WARNING: the Twitter requires Java 8 support. Therefore, the dep cannot be upgraded
@@ -103,6 +94,7 @@ object Config {
             const val robolectric = "org.robolectric:robolectric:4.0.2"
 
             const val core = "androidx.test:core:1.2.0"
+            const val archCoreTesting = "androidx.arch.core:core-testing:2.0.0"
             const val runner = "androidx.test:runner:1.2.0"
             const val rules = "androidx.test:rules:1.2.0"
         }

common/build.gradle.kts

@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    api(Config.Libs.Arch.runtime)
-    api(Config.Libs.Arch.viewModel)
+    api(Config.Libs.Androidx.lifecycleRuntime)
+    api(Config.Libs.Androidx.lifecycleViewModel)
     implementation(Config.Libs.Androidx.annotations)
-    annotationProcessor(Config.Libs.Arch.compiler)
+    annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 }

database/build.gradle.kts

@@ -20,8 +20,8 @@ dependencies {
     api(Config.Libs.Androidx.legacySupportv4)
     api(Config.Libs.Androidx.recyclerView)
 
-    compileOnly(Config.Libs.Arch.paging)
-    annotationProcessor(Config.Libs.Arch.compiler)
+    compileOnly(Config.Libs.Androidx.paging)
+    annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 
     androidTestImplementation(Config.Libs.Test.junit)
     androidTestImplementation(Config.Libs.Test.junitExt)

docs/upgrade-to-6.0.md

@@ -1,5 +1,8 @@
 # Upgrading to FirebaseUI 6.0
 
+**Note**: FirebaseUI versions `6.0.0` and `6.0.1` contain critical issues. Please use version
+`6.0.2` or later.
+
 FirebaseUI version `6.0.0` has no breaking API changes from version `5.1.0` but updates
 critical dependencies to new major versions.
 
@@ -17,10 +20,10 @@ Below is a comprehensive list of all of the relevant dependencies for each modul
 **Auth**
 
 ```
-android.arch.lifecycle:extensions:1.1.1
 androidx.browser:browser:1.0.0
 androidx.cardview:cardview:1.0.0
 androidx.constraintlayout:constraintlayout:1.1.3
+androidx.lifecycle:lifecycle-extensions:2.1.0
 androidx.legacy:legacy-support-v4:1.0.0
 com.google.android.material:material:1.0.0
 com.google.android.gms:play-services-auth:17.0.0
@@ -30,9 +33,9 @@ com.google.firebase:firebase-auth:19.0.0
 **Common**
 
 ```
-android.arch.lifecycle:runtime:1.1.1
-android.arch.lifecycle:viewmodel:1.1.1
 androidx.annotation:annotation:1.1.0
+androidx.lifecycle:lifecycle-runtime:2.1.0
+androidx.lifecycle:lifecycle-viewmodel:2.1.0
 ```
 
 **Database**
@@ -48,7 +51,7 @@ com.google.firebase:firebase-database:19.1.0
 ```
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
-com.google.firebase:firebase-firestore:21.1.0
+com.google.firebase:firebase-firestore:21.1.1
 ```
 
 **Storage**

firestore/build.gradle.kts

@@ -21,16 +21,17 @@ dependencies {
     api(Config.Libs.Androidx.legacySupportv4)
     api(Config.Libs.Androidx.recyclerView)
 
-    compileOnly(Config.Libs.Arch.paging)
-    annotationProcessor(Config.Libs.Arch.compiler)
+    compileOnly(Config.Libs.Androidx.paging)
+    annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 
     lintChecks(project(":lint"))
 
-    androidTestImplementation(Config.Libs.Arch.coreTesting)
+    androidTestImplementation(Config.Libs.Test.archCoreTesting)
+    androidTestImplementation(Config.Libs.Test.core)
     androidTestImplementation(Config.Libs.Test.junit)
     androidTestImplementation(Config.Libs.Test.junitExt)
     androidTestImplementation(Config.Libs.Test.runner)
     androidTestImplementation(Config.Libs.Test.rules)
     androidTestImplementation(Config.Libs.Test.mockito)
-    androidTestImplementation(Config.Libs.Arch.paging)
+    androidTestImplementation(Config.Libs.Androidx.paging)
 }

proguard-tests/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     implementation(project(":storage"))
 
     implementation(Config.Libs.Firebase.core)
-    implementation(Config.Libs.Arch.extensions)
+    implementation(Config.Libs.Androidx.lifecycleExtensions)
 }
 
 apply(plugin = "com.google.gms.google-services")