Skip to content

Commit 669fd80

Browse files
committed
Upgrade build to Gradle 3.0
Issue: SPR-14569
1 parent ed467f5 commit 669fd80

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

build.gradle

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

13491349
task wrapper(type: Wrapper) {
13501350
description = "Generates gradlew[.bat] scripts"
1351-
gradleVersion = "2.14.1"
1351+
gradleVersion = '3.0'
13521352

13531353
doLast() {
13541354
def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"

gradle/wrapper/gradle-wrapper.jar

-506 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 Jul 18 11:34:32 CEST 2016
1+
#Mon Aug 15 21:03:22 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.14.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

gradlew

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,9 @@ function splitJvmOpts() {
162162
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
163163
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
164164

165+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
166+
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
167+
cd "$(dirname "$0")"
168+
fi
169+
165170
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ goto fail
5050
@rem Get command-line arguments, handling Windows variants
5151

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

5554
:win9xME_args
5655
@rem Slurp the command line arguments.
@@ -61,11 +60,6 @@ set _SKIP=2
6160
if "x%~1" == "x" goto execute
6261

6362
set CMD_LINE_ARGS=%*
64-
goto execute
65-
66-
:4NT_args
67-
@rem Get arguments from the 4NT Shell from JP Software
68-
set CMD_LINE_ARGS=%$
6963

7064
:execute
7165
@rem Setup the command line

0 commit comments

Comments
 (0)