From cbccb910a28808fb1ae228ca7cab91c5fb0076cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 21 Aug 2016 11:04:55 +0200 Subject: [PATCH] gradle: bump plugin and wrapper version Since the new plugin requires 2.14.1 for security reasons. Also re-run `gradle wrapper` to update the scripts and the jar. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53639 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 46 ++++++++++++----------- gradlew.bat | 6 +-- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index f8d09e786..49b0130b6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' classpath files('libs/gradle-witness.jar') } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c6137b87896c8f70315ae454e00a969ef5f6019..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644 GIT binary patch delta 5357 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 b>f(bXDgRFX)g*-Wyodf=u=|8-c8&iBV!{Wc delta 5597 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 C04Iz9 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 56654d532..a8e9ea70b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip -distributionSha256Sum=e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionSha256Sum=cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39 diff --git a/gradlew b/gradlew index 9d82f7891..27309d923 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then diff --git a/gradlew.bat b/gradlew.bat index 72d362daf..f6d5974e7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome