From bca9d091805dc01a4456ab3f24e9de87f9b4aa48 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 17 Aug 2016 09:57:16 -0400 Subject: [PATCH] [android] #6050 - Updating Gradle Wrapper --- .../android/gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 53324 bytes platform/android/gradlew | 46 ++++++++++-------- platform/android/gradlew.bat | 8 +-- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/platform/android/gradle/wrapper/gradle-wrapper.jar b/platform/android/gradle/wrapper/gradle-wrapper.jar index 13372aef5e24af05341d49695ee84e5f9b594659..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644 GIT binary patch delta 5483 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 DmjXp= delta 5698 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 diff --git a/platform/android/gradlew b/platform/android/gradlew index 9d82f7891..27309d923 100755 --- a/platform/android/gradlew +++ b/platform/android/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/platform/android/gradlew.bat b/platform/android/gradlew.bat index aec99730b..f6d5974e7 100644 --- a/platform/android/gradlew.bat +++ b/platform/android/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