gradle: update

.travis.yml

@@ -17,17 +17,16 @@ 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.3-linux.zip
-  - unzip build-tools_r19.0.3-linux.zip -d $ANDROID_HOME
+  - wget https://dl-ssl.google.com/android/repository/build-tools_r19.1-linux.zip
+  - unzip build-tools_r19.1-linux.zip -d $ANDROID_HOME
   - mkdir -p $ANDROID_HOME/build-tools/
-  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.0.3
+  - mv $ANDROID_HOME/android-4.4.2 $ANDROID_HOME/build-tools/19.1.0
   # 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).
   # Other relevant API's
   - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
   - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
-  #- echo yes | android update sdk --filter sysimg-18 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
   # Create and start emulator

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.3. From extras add
+Install Android SDK and build-tools 19.1. 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,9 +43,9 @@ SDK is already installed.
 export ANDROID_HOME=/path/to/your/android-sdk
 ./android-stuff.sh
 ```
-To use a different  build-tools version (x) run:
+To use a different  build-tools version X run:
 ```
-find -name build.gradle | xargs sed -i 's/19.0.3/19.0.x/g'
+find -name build.gradle | xargs sed -i 's/19\.1/19.X/g'
 ```
 
 ### Eclipse

build.gradle

@@ -9,6 +9,10 @@ buildscript {
   }
 }
 
+//task wrapper(type: Wrapper) {
+//    gradleVersion = '1.12'
+//}
+
 apply from:'jdee.gradle'
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 16 12:24:18 EST 2014
+#Mon Jun 09 05:36:37 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip

vtm-android-app

@@ -1 +1 @@
-Subproject commit b22b1b7f228e3c955d59e424363d50663abcb0c7
+Subproject commit c27a583b22e1bedb5850266fd9dde91c83d28086

vtm-android-example/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.11.1'
   }
 }
 
@@ -22,7 +22,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.3'
+  buildToolsVersion '19.1'
 
   sourceSets {
     main {

vtm-android-gdx/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.11.1'
   }
 }
 
@@ -37,7 +37,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.3'
+  buildToolsVersion '19.1'
 
   sourceSets {
     main {

vtm-android-start/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.11.1'
   }
 }
 
@@ -20,7 +20,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.3'
+  buildToolsVersion '19.1'
 
   sourceSets {
     main {

vtm-android/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.11.1'
     // for aar/maven stuff
     // https://github.com/dcendents/android-maven-plugin
     classpath 'com.github.dcendents:android-maven-plugin:1.0'
@@ -35,7 +35,7 @@ dependencies {
 
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.3'
+  buildToolsVersion '19.1'
 
   sourceSets {
     main {

vtm-web-app/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     maven { url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' }
   }
   dependencies {
-    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.3'
+    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.4'
   }
 }
 

vtm-web-js/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     maven { url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' }
   }
   dependencies {
-    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.3'
+    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.4'
   }
 }
 

vtm-web/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     maven { url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' }
   }
   dependencies {
-    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.3'
+    classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.4'
   }
 }