From 4d62d27b5c66f4c68178a9c843ec4b11e7dca458 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Wed, 11 Jul 2018 11:29:39 +0800
Subject: [PATCH] Update dependencies

---
 .travis.yml                               | 5 +----
 build.gradle                              | 6 +++---
 mobile/build.gradle                       | 6 +++---
 mobile/src/main/res/values-v27/styles.xml | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39126b34..7624c465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,7 @@ install:
     - unzip -q tools.zip
     - popd
     - touch $HOME/.android/repositories.cfg
-    - yes | sdkmanager
-        "build-tools;28.0.0"
-        "platforms;android-28"
-      >/dev/null
+    - yes | sdkmanager --licenses
 
 script:
     - ./gradlew assembleDebug check
diff --git a/build.gradle b/build.gradle
index 224ea230..5f356026 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,10 +4,10 @@ apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
     ext {
-        androidPluginVersion = '3.1.3'
-        kotlinVersion = '1.2.50'
+        androidPluginVersion = '3.2.0-beta03'
+        kotlinVersion = '1.2.51'
         supportLibraryVersion = '28.0.0-alpha3'
-        takisoftFixVersion = '27.1.1.1'
+        takisoftFixVersion = '27.1.1.2'
     }
     repositories {
         google()
diff --git a/mobile/build.gradle b/mobile/build.gradle
index ddcc1e4f..8a61afc0 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    buildToolsVersion "28.0.0"
+    buildToolsVersion "28.0.1"
     compileSdkVersion 28
     defaultConfig {
         applicationId "be.mygod.vpnhotspot"
@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    kapt "com.android.databinding:compiler:$androidPluginVersion"
+    kapt "androidx.databinding:databinding-compiler:$androidPluginVersion"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "com.android.support:customtabs:$supportLibraryVersion"
     implementation "com.android.support:design:$supportLibraryVersion"
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
     implementation 'com.github.luongvo:BadgeView:1.1.5'
-    implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
+    implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.0'
     implementation "com.takisoft.fix:preference-v7:$takisoftFixVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     testImplementation 'junit:junit:4.12'
diff --git a/mobile/src/main/res/values-v27/styles.xml b/mobile/src/main/res/values-v27/styles.xml
index b9b2302c..2628b73d 100644
--- a/mobile/src/main/res/values-v27/styles.xml
+++ b/mobile/src/main/res/values-v27/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="AppTheme" parent="Theme.Design.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -7,7 +7,7 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="preferenceTheme">@style/AppTheme.Preference</item>
         <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
 </resources>