Skip to content

Commit 57130b2

Browse files
committed
Upgrade to Gradle 3.2.1
Issue: SPR-14906
1 parent b3e94dc commit 57130b2

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

gradle/wrapper/gradle-wrapper.jar

1.38 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-3.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

gradlew

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -155,16 +155,19 @@ if $cygwin ; then
155155
esac
156156
fi
157157

158-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
159-
function splitJvmOpts() {
160-
JVM_OPTS=("$@")
158+
# Escape application args
159+
save ( ) {
160+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
161+
echo " "
161162
}
162-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
163-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163+
APP_ARGS=$(save "$@")
164+
165+
# Collect all arguments for the java command, following the shell quoting and substitution rules
166+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
164167

165168
# 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
169+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
167170
cd "$(dirname "$0")"
168171
fi
169172

170-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
173+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)