From 44b3bd6b7e8f7c7a78206faf7efd63031488eacd Mon Sep 17 00:00:00 2001
From: Tuan Nguyen <nttuan2411@gmail.com>
Date: Thu, 15 Nov 2018 10:42:56 +0700
Subject: [PATCH 1/2] fix build project and fix crash Google Maps SDK when
 target 28 or above

---
 build.gradle                          | 6 +++---
 mobile/src/main/AndroidManifest.xml   | 4 ++++
 mobile/src/main/res/values/styles.xml | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4edadf9f49..7af528d2a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
         targetSdkVersion = 28
 
         // App dependencies
-        androidGradlePluginVersion = '3.2.0-beta04'
+        androidGradlePluginVersion = '3.2.0'
         appcompatVersion = '1.0.0-beta01'
         browserVersion = '1.0.0-beta01'
         constraintLayoutVersion = '1.1.2'
@@ -55,14 +55,14 @@ buildscript {
         gsonVersion = "2.8.1"
         hamcrestVersion = '1.3'
         junitVersion = '4.12'
-        kotlinVersion = '1.2.50'
+        kotlinVersion = '1.2.51'
         ktxVersion = "1.0.0-beta01"
         leakCanaryVersion = "1.5.4"
         leanbackVersion = '1.0.0-beta01'
         legacySupportVersion = '1.0.0-alpha1'
         lifecycleVersion = '2.0.0-beta01'
         lottieVersion = "2.5.1"
-        materialVersion = '1.0.0-beta01'
+        materialVersion = '1.0.0'
         mockitoVersion = "2.8.9"
         mockitoKotlinVersion = "1.5.0"
         okhttpVersion = "3.10.0"
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index d0db181372..c6f4acd30e 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -82,6 +82,10 @@
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${crashlyticsEnabled}" />
 
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
     </application>
 
 </manifest>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 40846ef273..ad22ad1220 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -113,7 +113,7 @@
         <item name="textAllCaps">false</item>
     </style>
 
-    <style name="TextAppearance.IOSched.BottomNavigationView" parent="@style/TextAppearance.MaterialComponents.BottomNavigationView.Colored">
+    <style name="TextAppearance.IOSched.BottomNavigationView" parent="@style/Widget.MaterialComponents.BottomNavigationView.Colored">
         <item name="android:fontFamily">@font/google_sans</item>
         <item name="android:textColor">@color/bottom_nav_item</item>
     </style>

From 25bdd6d4ebc6b9b65369875b4ba770f491629f89 Mon Sep 17 00:00:00 2001
From: Tuan Nguyen <nttuan2411@gmail.com>
Date: Thu, 15 Nov 2018 11:06:49 +0700
Subject: [PATCH 2/2] update travis build-tools-28.0.2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4d89f4247f..7c2d03a1d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.3
+    - build-tools-28.0.2
     - android-28
     - addon-google_apis-google-28
     - extra-google-m2repository