From 8d5f056182f9570905261ce0cbd6abe6d6f3d497 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 10 Apr 2017 23:36:08 +0100 Subject: [PATCH] Update Gradle to 3.5 --- gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 53556 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 46 ++++++++++++----------- gradlew.bat | 8 ++-- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..ca78035ef0501d802d4fc55381ef2d5c3ce0ec6e 100644 GIT binary patch delta 3725 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 M+arpIM*|o9FP9^Dn*aa+ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e97146b06..880ea0727 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 25 16:14:00 BST 2016 +#Mon Apr 10 23:35:35 BST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/gradlew b/gradlew index 97fac783e..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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - 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 aec99730b..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 @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args