diff --git a/.travis.yml b/.travis.yml index a4128c71..90746b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,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_r21.1.1-linux.zip - - unzip build-tools_r21.1.1-linux.zip -d $ANDROID_HOME + - wget https://dl-ssl.google.com/android/repository/build-tools_r22-linux.zip + - unzip build-tools_r22-linux.zip -d $ANDROID_HOME - mkdir -p $ANDROID_HOME/build-tools/ - - mv $ANDROID_HOME/android-5.0 $ANDROID_HOME/build-tools/21.1.1 + - mv $ANDROID_HOME/android-5.1 $ANDROID_HOME/build-tools/22 # 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 9ee721cb..e246f981 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ Just import build.gradle You can run gradle tasks directly (see also `./gradlew -q tasks`):
`./gradlew clean install`
to build the libraries and add them to the local maven repository.
`./gradlew :vtm-android-example:run`
to run the android example
-`./gradlew :vtm-gdx-desktop:run`
to run the desktop demo (only Linux64 and Win64 native libs are provided atm)
-`./gradlew :vtm-gdx-html:jettyDraftWar`
to run the webgl demo
+`./gradlew :vtm-desktop:run`
to run the desktop demo (only Linux64 and Win64 native libs are provided atm)
+`./gradlew :vtm-web-app:jettyDraftWar`
to run the webgl demo
## WebGL Demo diff --git a/build.gradle b/build.gradle index 3c987098..787fa32c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,11 @@ buildscript { dependencies { classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.3' - classpath 'com.android.tools.build:gradle:0.14.2' + classpath 'com.android.tools.build:gradle:1.0.1' // for aar/maven stuff // https://github.com/dcendents/android-maven-plugin - classpath 'com.github.dcendents:android-maven-plugin:1.1' + classpath 'com.github.dcendents:android-maven-plugin:1.2' } } @@ -24,7 +24,7 @@ def filterProjects(filter) { } task wrapper(type: Wrapper) { - gradleVersion = '2.1' + gradleVersion = '2.3' } //apply from:'jdee.gradle' @@ -34,13 +34,13 @@ allprojects { version = '0.6.0-SNAPSHOT' ext.gdxVersion = "1.4.1" - ext.androidBuildVersionTools = "21.1.1" + ext.androidBuildVersionTools = "22" repositories { + maven { url 'https://github.com/hjanetzek/maven-repo/raw/master/' } mavenCentral() // Jeo - maven { url 'http://repo.boundlessgeo.com/main' } - //maven { url 'https://github.com/hjanetzek/maven-repo/raw/master/' } + // maven { url 'http://repo.boundlessgeo.com/main' } mavenLocal() // Local andoird repo maven { url "${System.env.ANDROID_HOME}/extras/android/m2repository" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3d0dee6e..085a1cdc 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 63d358dc..d73863e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 19 16:09:27 CEST 2014 +#Thu Mar 19 13:11:24 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip