From fbfe17743ed6c8621d934bcebed71c30c04cec27 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Mon, 12 May 2014 14:48:27 +0200
Subject: [PATCH] update android build-tools

---
 .travis.yml                      | 6 +++---
 README.md                        | 6 +++++-
 gradle.properties                | 6 ++++--
 vtm-android-app                  | 2 +-
 vtm-android-example/build.gradle | 4 ++--
 vtm-android-gdx/build.gradle     | 2 +-
 vtm-android-start/build.gradle   | 2 +-
 vtm-android/build.gradle         | 2 +-
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2dc93692..ccea9552 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ before_install:
   - export ANDROID_HOME=$PWD/android-sdk-linux
   - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
   # install android build tools
-  - wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.1-linux.zip
-  - unzip build-tools_r19.0.1-linux.zip -d $ANDROID_HOME
+  - wget https://dl-ssl.google.com/android/repository/build-tools_r19.0.3-linux.zip
+  - unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
   - mkdir -p $ANDROID_HOME/build-tools/
-  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.1
+  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.3
   # Install required components.
   # For a full list, run `android list sdk -a --extended`
   # Note that sysimg-18 downloads the ARM, x86 and MIPS images (we should optimize this).
diff --git a/README.md b/README.md
index e467fa10..bd9bf61e 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ VTM is part of the OpenScienceMap project and developed at University of Bremen.
 
 `git clone --recursive https://github.com/opensciencemap/vtm`
 
-Install Android SDK and build-tools 19.0.1. From extras add
+Install Android SDK and build-tools 19.0.3. From extras add
 'Android Support Library/Repository' and 'Google Repository'.
 The commands below should set things up correctly when Android
 SDK is already installed.
@@ -43,6 +43,10 @@ SDK is already installed.
 export ANDROID_HOME=/path/to/your/android-sdk
 ./android-stuff.sh
 ```
+To use a different  build-tools version (x) run:
+```
+find -name build.gradle | xargs sed -i 's/19.0.3/19.0.x/g'
+```
 
 ### Eclipse
 `./gradlew eclipse`<br/>
diff --git a/gradle.properties b/gradle.properties
index a100a29d..449ef9ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,6 +14,8 @@
 # POM_DEVELOPER_NAME=Hannes Janetzek
 
 org.gradle.daemon=true
-org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=512m
-#org.gradle.parallel=true
+
+# options to speed up compilation once everything else is working:
+org.gradle.parallel=false
+org.gradle.configureondemand=false
diff --git a/vtm-android-app b/vtm-android-app
index 2a18af29..bf445ffd 160000
--- a/vtm-android-app
+++ b/vtm-android-app
@@ -1 +1 @@
-Subproject commit 2a18af29d54dc057f050cb7ce6d8189deffec9e8
+Subproject commit bf445ffd8080f638ce965e0646408ce7e3a4efc5
diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
index 32f0c3bb..3c0995ad 100644
--- a/vtm-android-example/build.gradle
+++ b/vtm-android-example/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.1'
+  buildToolsVersion '19.0.3'
 
   sourceSets {
     main {
@@ -86,4 +86,4 @@ task run (dependsOn: 'installDebug'){
     proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
     proc.waitFor()
   }
-}
\ No newline at end of file
+}
diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle
index 951c2def..208942c9 100644
--- a/vtm-android-gdx/build.gradle
+++ b/vtm-android-gdx/build.gradle
@@ -37,7 +37,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.1'
+  buildToolsVersion '19.0.3'
 
   sourceSets {
     main {
diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle
index ae3876cc..e955c593 100644
--- a/vtm-android-start/build.gradle
+++ b/vtm-android-start/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.1'
+  buildToolsVersion '19.0.3'
 
   sourceSets {
     main {
diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle
index dbece501..aeb9727d 100644
--- a/vtm-android/build.gradle
+++ b/vtm-android/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.1'
+  buildToolsVersion '19.0.3'
 
   sourceSets {
     main {