Permalink
Browse files

Update build tools, Gradle version + wrapper, Android plugin

  • Loading branch information...
cketti committed Oct 5, 2016
1 parent 59cbdcc commit dd1040f54677676c5de3aaa6db3f76ff30010bc7
Showing with 10 additions and 11 deletions.
  1. +1 βˆ’1 .travis.yml
  2. +2 βˆ’2 build.gradle
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +2 βˆ’2 gradle/wrapper/gradle-wrapper.properties
  5. +5 βˆ’0 gradlew
  6. +0 βˆ’6 gradlew.bat
View
@@ -2,7 +2,7 @@ language: android
android:
components:
- tools
- build-tools-23.0.3
- build-tools-24.0.3
- android-24
- extra-android-m2repository
View
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.2.0'
}
}
@@ -14,7 +14,7 @@ project.ext {
optimizeForDevelopment = project.hasProperty('optimizeForDevelopment') && optimizeForDevelopment == 'true'
compileSdkVersion = 24
buildToolsVersion = '23.0.3'
buildToolsVersion = '24.0.3'
}
subprojects {
Binary file not shown.
@@ -1,6 +1,6 @@
#Tue Aug 16 01:22:57 CEST 2016
#Wed Oct 05 23:11:53 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
View
@@ -161,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
View
@@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line

0 comments on commit dd1040f

Please sign in to comment.