Skip to content

Commit 568a984

Browse files
committed
Update Gradle wrapper
1 parent d14c53f commit 568a984

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

gradle/wrapper/gradle-wrapper.jar

-1.02 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Jun 30 23:48:49 GMT+08:00 2016
1+
#Mon Sep 14 12:28:28 PDT 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,12 @@
66
##
77
##############################################################################
88

9-
# Attempt to set APP_HOME
10-
# Resolve links: $0 may be a link
11-
PRG="$0"
12-
# Need this for relative symlinks.
13-
while [ -h "$PRG" ] ; do
14-
ls=`ls -ld "$PRG"`
15-
link=`expr "$ls" : '.*-> \(.*\)$'`
16-
if expr "$link" : '/.*' > /dev/null; then
17-
PRG="$link"
18-
else
19-
PRG=`dirname "$PRG"`"/$link"
20-
fi
21-
done
22-
SAVED="`pwd`"
23-
cd "`dirname \"$PRG\"`/" >/dev/null
24-
APP_HOME="`pwd -P`"
25-
cd "$SAVED" >/dev/null
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
2611

2712
APP_NAME="Gradle"
2813
APP_BASE_NAME=`basename "$0"`
2914

30-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
32-
3315
# Use the maximum available, or set MAX_FD != -1 to use that value.
3416
MAX_FD="maximum"
3517

@@ -48,7 +30,6 @@ die ( ) {
4830
cygwin=false
4931
msys=false
5032
darwin=false
51-
nonstop=false
5233
case "`uname`" in
5334
CYGWIN* )
5435
cygwin=true
@@ -59,11 +40,31 @@ case "`uname`" in
5940
MINGW* )
6041
msys=true
6142
;;
62-
NONSTOP* )
63-
nonstop=true
64-
;;
6543
esac
6644

45+
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46+
if $cygwin ; then
47+
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48+
fi
49+
50+
# Attempt to set APP_HOME
51+
# Resolve links: $0 may be a link
52+
PRG="$0"
53+
# Need this for relative symlinks.
54+
while [ -h "$PRG" ] ; do
55+
ls=`ls -ld "$PRG"`
56+
link=`expr "$ls" : '.*-> \(.*\)$'`
57+
if expr "$link" : '/.*' > /dev/null; then
58+
PRG="$link"
59+
else
60+
PRG=`dirname "$PRG"`"/$link"
61+
fi
62+
done
63+
SAVED="`pwd`"
64+
cd "`dirname \"$PRG\"`/" >&-
65+
APP_HOME="`pwd -P`"
66+
cd "$SAVED" >&-
67+
6768
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6869

6970
# Determine the Java command to use to start the JVM.
@@ -89,7 +90,7 @@ location of your Java installation."
8990
fi
9091

9192
# Increase the maximum file descriptors if we can.
92-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
9394
MAX_FD_LIMIT=`ulimit -H -n`
9495
if [ $? -eq 0 ] ; then
9596
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -113,7 +114,6 @@ fi
113114
if $cygwin ; then
114115
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115116
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116-
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12+
set DEFAULT_JVM_OPTS=
13+
1114
set DIRNAME=%~dp0
1215
if "%DIRNAME%" == "" set DIRNAME=.
1316
set APP_BASE_NAME=%~n0
1417
set APP_HOME=%DIRNAME%
1518

16-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
18-
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,7 +46,7 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windows variants
49+
@rem Get command-line arguments, handling Windowz variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
5252
if "%@eval[2+2]" == "4" goto 4NT_args

0 commit comments

Comments
 (0)