From 3a219305d801f79c5385583e8ae8a9e9febc0160 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sat, 24 Sep 2016 21:00:24 +0200
Subject: [PATCH] Update build tools, sdk version and api lib

---
 .travis.yml   | 14 ++++++--------
 build.gradle  |  6 +++---
 extern/GmsApi |  2 +-
 safe-parcel   |  1 -
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 120000 safe-parcel

diff --git a/.travis.yml b/.travis.yml
index 8f34e4b8..c57a40b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,19 @@
 language: android
-sudo: false
 git:
   submodules: false
 before_install:
   - git submodule update --init --recursive
-before_script:
-  - echo sdk.dir $ANDROID_HOME > local.properties
 script:
+  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
   - export TERM=dumb
-  - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
-  - ./gradlew build
+  - echo sdk.dir $ANDROID_HOME > local.properties
+  - jdk_switcher use oraclejdk8
+  - ./gradlew assemble
 android:
   components:
-  - platform-tools
   - tools
-  - build-tools-23.0.3
-  - android-23
+  - build-tools-24.0.2
+  - android-24
   - extra-android-m2repository
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
diff --git a/build.gradle b/build.gradle
index 635996ac..27dfeb02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,17 +19,17 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "23.0.3"
+    ext.androidBuildVersionTools = "24.0.2"
 }
 
-def androidCompileSdk() { return 23 }
+def androidCompileSdk() { return 24 }
 
 subprojects {
     group = 'org.microg'
diff --git a/extern/GmsApi b/extern/GmsApi
index c6f5d258..acec513b 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit c6f5d25850d86a78119c0175678c81178b0500e1
+Subproject commit acec513b19aaba856722fc22c9adf3f5e0ea3ac7
diff --git a/safe-parcel b/safe-parcel
deleted file mode 120000
index 5c222c0b..00000000
--- a/safe-parcel
+++ /dev/null
@@ -1 +0,0 @@
-extern/GmsApi/safe-parcel
\ No newline at end of file