Skip to content

Commit bb1a031

Browse files
committed
Upgrade to Gradle 2.13
Issue: SPR-14215
1 parent 87b93a7 commit bb1a031

File tree

5 files changed

+33
-29
lines changed

5 files changed

+33
-29
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ configure(rootProject) {
13731373

13741374
task wrapper(type: Wrapper) {
13751375
description = "Generates gradlew[.bat] scripts"
1376-
gradleVersion = "2.12"
1376+
gradleVersion = "2.13"
13771377

13781378
doLast() {
13791379
def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"

gradle/wrapper/gradle-wrapper.jar

-83 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Mar 14 14:42:52 CET 2016
1+
#Mon Apr 25 12:42:24 CEST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

gradlew

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

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
11-
DEFAULT_JVM_OPTS=""
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
1226

1327
APP_NAME="Gradle"
1428
APP_BASE_NAME=`basename "$0"`
1529

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
GRADLE_OPTS="-XX:MaxMetaspaceSize=1024m -Xmx1024m $GRADLE_OPTS"
32+
DEFAULT_JVM_OPTS=""
33+
1634
# Use the maximum available, or set MAX_FD != -1 to use that value.
1735
MAX_FD="maximum"
1836

@@ -31,6 +49,7 @@ die ( ) {
3149
cygwin=false
3250
msys=false
3351
darwin=false
52+
nonstop=false
3453
case "`uname`" in
3554
CYGWIN* )
3655
cygwin=true
@@ -41,26 +60,11 @@ case "`uname`" in
4160
MINGW* )
4261
msys=true
4362
;;
63+
NONSTOP* )
64+
nonstop=true
65+
;;
4466
esac
4567

46-
# Attempt to set APP_HOME
47-
# Resolve links: $0 may be a link
48-
PRG="$0"
49-
# Need this for relative symlinks.
50-
while [ -h "$PRG" ] ; do
51-
ls=`ls -ld "$PRG"`
52-
link=`expr "$ls" : '.*-> \(.*\)$'`
53-
if expr "$link" : '/.*' > /dev/null; then
54-
PRG="$link"
55-
else
56-
PRG=`dirname "$PRG"`"/$link"
57-
fi
58-
done
59-
SAVED="`pwd`"
60-
cd "`dirname \"$PRG\"`/" >/dev/null
61-
APP_HOME="`pwd -P`"
62-
cd "$SAVED" >/dev/null
63-
6468
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6569

6670
# Determine the Java command to use to start the JVM.
@@ -86,7 +90,7 @@ location of your Java installation."
8690
fi
8791

8892
# Increase the maximum file descriptors if we can.
89-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
93+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9094
MAX_FD_LIMIT=`ulimit -H -n`
9195
if [ $? -eq 0 ] ; then
9296
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

gradlew.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
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 GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
13-
set DEFAULT_JVM_OPTS=
14-
1511
set DIRNAME=%~dp0
1612
if "%DIRNAME%" == "" set DIRNAME=.
1713
set APP_BASE_NAME=%~n0
1814
set APP_HOME=%DIRNAME%
1915

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 GRADLE_OPTS=-XX:MaxMetaspaceSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS%
18+
set DEFAULT_JVM_OPTS=
19+
2020
@rem Find java.exe
2121
if defined JAVA_HOME goto findJavaFromJavaHome
2222

0 commit comments

Comments
 (0)