From 883afe9bd418f40ddbc7734dcb609def2bb911fb Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 5 Jun 2019 12:33:42 -0700
Subject: [PATCH] No issue: Update dependencies

---
 app/build.gradle                       |  1 +
 app/src/main/res/values/styles.xml     |  4 ++--
 buildSrc/src/main/java/Dependencies.kt | 20 +++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4e4a6b9c5..fdb0f1b39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -272,6 +272,7 @@ dependencies {
     implementation Deps.kotlin_coroutines
     implementation Deps.androidx_appcompat
     implementation Deps.androidx_constraintlayout
+    implementation Deps.androidx_coordinatorlayout
 
     implementation Deps.rxAndroid
     implementation Deps.rxKotlin
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f0fb5b19c..ee105bf08 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="NormalThemeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="NormalThemeBase" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
         <!-- Android system styling -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
@@ -77,7 +77,7 @@
 
     <style name="DialogStyleNormal" parent="DialogStyleLight"/>
 
-    <style name="PrivateThemeBase" parent="Theme.AppCompat.NoActionBar">
+    <style name="PrivateThemeBase" parent="Theme.MaterialComponents.NoActionBar.Bridge">
         <!-- Android system styling -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index d6002bd56..3a95e0045 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -14,20 +14,21 @@ private object Versions {
     const val leakcanary = "1.6.3"
     const val leanplum = "4.3.1"
 
-    const val androidx_appcompat = "1.1.0-alpha05"
+    const val androidx_appcompat = "1.1.0-beta01"
+    const val androidx_coordinator_layout = "1.1.0-beta01"
     const val androidx_constraint_layout = "2.0.0-beta1"
-    const val androidx_preference = "1.1.0-alpha05"
+    const val androidx_preference = "1.1.0-beta01"
     const val androidx_legacy = "1.0.0"
-    const val androidx_annotation = "1.1.0-rc01"
+    const val androidx_annotation = "1.1.0"
     const val androidx_lifecycle = "2.2.0-alpha01"
-    const val androidx_fragment = "1.1.0-alpha09"
-    const val androidx_navigation = "2.1.0-alpha04"
-    const val androidx_recyclerview = "1.1.0-alpha05"
+    const val androidx_fragment = "1.1.0-beta01"
+    const val androidx_navigation = "2.1.0-alpha05"
+    const val androidx_recyclerview = "1.1.0-alpha06"
     const val androidx_lifecycle_savedstate = "1.0.0-alpha01"
     const val androidx_testing = "1.1.0-alpha08"
-    const val androidx_core = "1.2.0-alpha01"
-    const val androidx_transition = "1.1.0-rc01"
-    const val google_material = "1.1.0-alpha06"
+    const val androidx_core = "1.1.0-rc01"
+    const val androidx_transition = "1.1.0-rc02"
+    const val google_material = "1.1.0-alpha07"
 
     const val mozilla_android_components = "0.56.0-SNAPSHOT"
     // Note that android-components also depends on application-services,
@@ -140,6 +141,7 @@ object Deps {
     const val androidx_annotation = "androidx.annotation:annotation:${Versions.androidx_annotation}"
     const val androidx_fragment = "androidx.fragment:fragment:${Versions.androidx_fragment}"
     const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.androidx_appcompat}"
+    const val androidx_coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:${Versions.androidx_coordinator_layout}"
     const val androidx_constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.androidx_constraint_layout}"
     const val androidx_legacy = "androidx.legacy:legacy-support-v4:${Versions.androidx_legacy}"
     const val androidx_lifecycle_extensions = "androidx.lifecycle:lifecycle-extensions:${Versions.androidx_lifecycle}"