From a488b4b0db297c18d8824db93fcba7b184b04d52 Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Mon, 19 Nov 2018 15:02:02 -0500
Subject: [PATCH 1/3] Move to support library v28

---
 .../auth/util/ui/BaselineTextInputLayout.java | 28 -------------------
 auth/src/main/res/layout/fui_phone_layout.xml |  4 +--
 buildSrc/src/main/kotlin/Config.kt            | 16 +++++------
 3 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java

diff --git a/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java b/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java
deleted file mode 100644
index a1c9fcf0d..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.firebase.ui.auth.util.ui;
-
-import android.content.Context;
-import android.support.annotation.RestrictTo;
-import android.support.design.widget.TextInputLayout;
-import android.util.AttributeSet;
-import android.widget.EditText;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class BaselineTextInputLayout extends TextInputLayout {
-    public BaselineTextInputLayout(Context context) {
-        super(context);
-    }
-
-    public BaselineTextInputLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public BaselineTextInputLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    public int getBaseline() {
-        EditText text = getEditText();
-        return text == null ? super.getBaseline() : text.getPaddingTop() + text.getBaseline();
-    }
-}
diff --git a/auth/src/main/res/layout/fui_phone_layout.xml b/auth/src/main/res/layout/fui_phone_layout.xml
index 28cc7f7d2..1a2dece45 100644
--- a/auth/src/main/res/layout/fui_phone_layout.xml
+++ b/auth/src/main/res/layout/fui_phone_layout.xml
@@ -25,7 +25,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
 
-            <com.firebase.ui.auth.util.ui.BaselineTextInputLayout
+            <android.support.design.widget.TextInputLayout
                 android:id="@+id/phone_layout"
                 style="@style/FirebaseUI.TextInputLayout.PhoneField"
                 android:layout_width="0dp"
@@ -39,7 +39,7 @@
                     style="@style/FirebaseUI.TextInputEditText.PhoneField"
                     android:imeOptions="actionDone" />
 
-            </com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
+            </android.support.design.widget.TextInputLayout>
 
             <Button
                 android:id="@+id/send_code"
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 37e2ef5f6..68b931936 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -5,15 +5,15 @@ object Config {
     private const val kotlinVersion = "1.2.61"
 
     object SdkVersions {
-        const val compile = 27
-        const val target = 27
+        const val compile = 28
+        const val target = 28
         const val min = 16
     }
 
     object Plugins {
         const val android = "com.android.tools.build:gradle:3.2.1"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        const val google = "com.google.gms:google-services:4.0.2"
+        const val google = "com.google.gms:google-services:4.2.0"
 
         const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
@@ -25,7 +25,7 @@ object Config {
         }
 
         object Support {
-            private const val version = "27.1.1"
+            private const val version = "28.0.0"
 
             const val multidex = "com.android.support:multidex:1.0.3"
             const val annotations = "com.android.support:support-annotations:$version"
@@ -51,11 +51,11 @@ object Config {
         }
 
         object Firebase {
-            const val core = "com.google.firebase:firebase-core:16.0.4"
+            const val core = "com.google.firebase:firebase-core:16.0.5"
             const val auth = "com.google.firebase:firebase-auth:16.0.5"
-            const val firestore = "com.google.firebase:firebase-firestore:17.1.1"
-            const val database = "com.google.firebase:firebase-database:16.0.3"
-            const val storage = "com.google.firebase:firebase-storage:16.0.3"
+            const val firestore = "com.google.firebase:firebase-firestore:17.1.3"
+            const val database = "com.google.firebase:firebase-database:16.0.5"
+            const val storage = "com.google.firebase:firebase-storage:16.0.5"
         }
 
         object PlayServices {

From 47e0f8187ddcc217fea5b6c7cc9b2c9551b74798 Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Mon, 19 Nov 2018 15:41:07 -0500
Subject: [PATCH 2/3] Fix lint

---
 auth/build.gradle.kts              | 1 +
 buildSrc/src/main/kotlin/Config.kt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 312a444f9..674e4e120 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
     api(Config.Libs.PlayServices.auth)
 
     compileOnly(Config.Libs.Provider.facebook)
+    implementation(Config.Libs.Support.v4) // Needed to override deps
     implementation(Config.Libs.Support.cardView) // Needed to override Facebook
     compileOnly(Config.Libs.Provider.twitter) { isTransitive = true }
 
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 68b931936..2fb1472b5 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -35,6 +35,7 @@ object Config {
             const val recyclerView = "com.android.support:recyclerview-v7:$version"
             const val cardView = "com.android.support:cardview-v7:$version"
             const val customTabs = "com.android.support:customtabs:$version"
+            const val mediaCompat = "com.android.support:support-media-compat:$version"
 
             const val constraint = "com.android.support.constraint:constraint-layout:1.1.3"
         }
@@ -64,7 +65,7 @@ object Config {
 
 
         object Provider {
-            const val facebook = "com.facebook.android:facebook-login:4.35.0"
+            const val facebook = "com.facebook.android:facebook-login:4.38.1"
             // WARNING: the Twitter requires Java 8 support. Therefore, the dep cannot be upgraded
             // futher until we decide to force clients to enable Java 8 support.
             const val twitter = "com.twitter.sdk.android:twitter-core:3.1.1@aar"

From 96e9670e770c75fd935a751e6a4f0c4a5f832b16 Mon Sep 17 00:00:00 2001
From: Sam <samstern@google.com>
Date: Mon, 19 Nov 2018 16:18:39 -0500
Subject: [PATCH 3/3] Fix tests

---
 .../com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java     | 2 +-
 buildSrc/src/main/kotlin/Config.kt                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
index 9681461b3..fbcd84aaf 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
@@ -85,7 +85,7 @@ public void testGetCountryCode() {
     }
 
     @Test
-    @Config(constants = BuildConfig.class, sdk = 16)
+    @Config(sdk = 16)
     public void testFormatNumberToE164_belowApi21() {
         String validPhoneNumber = "+919994947354";
         CountryInfo indiaCountryInfo = new CountryInfo(new Locale("", "IN"), 91);
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 2fb1472b5..e072b844e 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -100,7 +100,7 @@ object Config {
             const val junit = "junit:junit:4.12"
             const val truth = "com.google.truth:truth:0.42"
             const val mockito = "org.mockito:mockito-android:2.21.0"
-            const val robolectric = "org.robolectric:robolectric:3.8"
+            const val robolectric = "org.robolectric:robolectric:4.0.2"
 
             const val runner = "com.android.support.test:runner:1.0.2"
             const val rules = "com.android.support.test:rules:1.0.2"