diff --git a/.travis.yml b/.travis.yml index ccea9552..d4b4df21 100644 --- a/.travis.yml +++ b/.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 diff --git a/README.md b/README.md index bd9bf61e..268c355e 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.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 diff --git a/build.gradle b/build.gradle index 6a768618..4c192c9f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,10 @@ buildscript { } } +//task wrapper(type: Wrapper) { +// gradleVersion = '1.12' +//} + apply from:'jdee.gradle' allprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d5c591c9..0087cd3b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b961d76..655c7a5d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/vtm-android-app b/vtm-android-app index b22b1b7f..c27a583b 160000 --- a/vtm-android-app +++ b/vtm-android-app @@ -1 +1 @@ -Subproject commit b22b1b7f228e3c955d59e424363d50663abcb0c7 +Subproject commit c27a583b22e1bedb5850266fd9dde91c83d28086 diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 3c0995ad..dc6ba8fe 100644 --- a/vtm-android-example/build.gradle +++ b/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 { diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle index 208942c9..ceaf141e 100644 --- a/vtm-android-gdx/build.gradle +++ b/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 { diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle index e955c593..2d270a50 100644 --- a/vtm-android-start/build.gradle +++ b/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 { diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index aeb9727d..1bf32b78 100644 --- a/vtm-android/build.gradle +++ b/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 { diff --git a/vtm-web-app/build.gradle b/vtm-web-app/build.gradle index 91040d4b..c23738e7 100644 --- a/vtm-web-app/build.gradle +++ b/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' } } diff --git a/vtm-web-js/build.gradle b/vtm-web-js/build.gradle index 2cc0a77e..43e5219c 100644 --- a/vtm-web-js/build.gradle +++ b/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' } } diff --git a/vtm-web/build.gradle b/vtm-web/build.gradle index 24980f17..a9624f5d 100644 --- a/vtm-web/build.gradle +++ b/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' } }