diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 941144813..13372aef5 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 5300a0982..22d6f6602 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 16 10:47:35 CST 2015 +#Wed Apr 27 08:20:39 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip diff --git a/gradlew b/gradlew index 28afbd4c0..9d82f7891 100755 --- a/gradlew +++ b/gradlew @@ -12,7 +12,7 @@ DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` -# Use the maximum available, or customizationSet MAX_FD != -1 to use that value. +# Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" warn ( ) { @@ -42,7 +42,7 @@ case "`uname`" in ;; esac -# Attempt to customizationSet APP_HOME +# Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" # Need this for relative symlinks. @@ -71,16 +71,16 @@ if [ -n "$JAVA_HOME" ] ; then JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is customizationSet to an invalid directory: $JAVA_HOME + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME -Please customizationSet the JAVA_HOME variable in your environment to match the +Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not customizationSet and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -Please customizationSet the JAVA_HOME variable in your environment to match the +Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi @@ -93,7 +93,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then fi ulimit -n $MAX_FD if [ $? -ne 0 ] ; then - warn "Could not customizationSet maximum file descriptor limit: $MAX_FD" + warn "Could not set maximum file descriptor limit: $MAX_FD" fi else warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" @@ -137,16 +137,16 @@ if $cygwin ; then i=$((i+1)) done case $i in - (0) customizationSet -- ;; - (1) customizationSet -- "$args0" ;; - (2) customizationSet -- "$args0" "$args1" ;; - (3) customizationSet -- "$args0" "$args1" "$args2" ;; - (4) customizationSet -- "$args0" "$args1" "$args2" "$args3" ;; - (5) customizationSet -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) customizationSet -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) customizationSet -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) customizationSet -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) customizationSet -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi diff --git a/gradlew.bat b/gradlew.bat index e303abd07..aec99730b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -9,38 +9,38 @@ 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. -customizationSet DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS= -customizationSet DIRNAME=%~dp0 -if "%DIRNAME%" == "" customizationSet DIRNAME=. -customizationSet APP_BASE_NAME=%~n0 -customizationSet APP_HOME=%DIRNAME% +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome -customizationSet JAVA_EXE=java.exe +set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if "%ERRORLEVEL%" == "0" goto init echo. -echo ERROR: JAVA_HOME is not customizationSet and no 'java' command could be found in your PATH. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo. -echo Please customizationSet the JAVA_HOME variable in your environment to match the +echo Please set the JAVA_HOME variable in your environment to match the echo location of your Java installation. goto fail :findJavaFromJavaHome -customizationSet JAVA_HOME=%JAVA_HOME:"=% -customizationSet JAVA_EXE=%JAVA_HOME%/bin/java.exe +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto init echo. -echo ERROR: JAVA_HOME is customizationSet to an invalid directory: %JAVA_HOME% +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo. -echo Please customizationSet the JAVA_HOME variable in your environment to match the +echo Please set the JAVA_HOME variable in your environment to match the echo location of your Java installation. goto fail @@ -53,23 +53,23 @@ if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. -customizationSet CMD_LINE_ARGS= -customizationSet _SKIP=2 +set CMD_LINE_ARGS= +set _SKIP=2 :win9xME_args_slurp if "x%~1" == "x" goto execute -customizationSet CMD_LINE_ARGS=%* +set CMD_LINE_ARGS=%* goto execute :4NT_args @rem Get arguments from the 4NT Shell from JP Software -customizationSet CMD_LINE_ARGS=%$ +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line -customizationSet CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%