From ee8e5427c4feb1dcd9c5a36e9df1a9181b3e9017 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 15 Oct 2019 14:54:05 +0200
Subject: [PATCH] Update build system and deps

---
 .travis.yml                              | 2 +-
 build.gradle                             | 6 +++---
 extern/GmsApi                            | 2 +-
 extern/GmsLib                            | 2 +-
 gradle.properties                        | 1 -
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 proguard.flags                           | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/.travis.yml b/.travis.yml
index 822e0de0..87ad538a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-28.0.3
+  - build-tools-29.0.2
   - android-27
   - android-28
   - extra-android-m2repository
diff --git a/build.gradle b/build.gradle
index 76056a02..b6ffdcde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -29,7 +29,7 @@ buildscript {
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "28.0.3"
+    ext.androidBuildVersionTools = "29.0.2"
     ext.supportLibraryVersion = "28.0.0"
     ext.isReleaseVersion = false
     ext.slf4jVersion = "1.7.25"
@@ -37,7 +37,7 @@ allprojects {
 
 def androidCompileSdk() { return 28 }
 
-def androidTargetSdk() { return 28 }
+def androidTargetSdk() { return 29 }
 
 def androidMinSdk() { return 14 }
 
diff --git a/extern/GmsApi b/extern/GmsApi
index 51509859..2a43448e 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e
+Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6
diff --git a/extern/GmsLib b/extern/GmsLib
index 39d20ec1..15cd4491 160000
--- a/extern/GmsLib
+++ b/extern/GmsLib
@@ -1 +1 @@
-Subproject commit 39d20ec1f28bcc4b134d76f43296bad587362c69
+Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index dfbe4787..00000000
--- a/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-android.useDeprecatedNdk=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7919ae6e..d757f3d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/proguard.flags b/proguard.flags
index 6be46b9c..bc1febc5 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -3,7 +3,7 @@
 -optimizations !code/allocation/variable
 
 # We're referencing stuff that is unknown to the system
--libraryjar ../unifiednlp-compat/build/classes/java/main
+#-libraryjar ../unifiednlp-compat/build/classes/java/main
 -dontwarn java.awt.**
 -dontwarn javax.annotation.**