Skip to content

Commit f4e0d7f

Browse files
committed
Update to Gradle version 3.2
1 parent 8554741 commit f4e0d7f

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import static org.gradle.api.tasks.wrapper.Wrapper.DistributionType
2+
13
import groovy.xml.XmlUtil
24

35
buildscript {
@@ -599,5 +601,7 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
599601
}
600602

601603
task wrapper(type: Wrapper) {
602-
gradleVersion = '3.0'
604+
gradleVersion = '3.2'
605+
// We want the sources with the wrapper.
606+
distributionType = DistributionType.ALL
603607
}

gradle/wrapper/gradle-wrapper.jar

1.37 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Aug 22 07:45:14 EDT 2016
1+
#Fri Dec 09 20:48:35 EST 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-3.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip

gradlew

Lines changed: 11 additions & 9 deletions
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
##
@@ -154,16 +154,18 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
160-
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
157+
# Escape application args
158+
for s in "${@}" ; do
159+
s=\"$s\"
160+
APP_ARGS=$APP_ARGS" "$s
161+
done
162+
163+
# Collect all arguments for the java command, following the shell quoting and substitution rules
164+
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
163165

164166
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165-
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
167+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
166168
cd "$(dirname "$0")"
167169
fi
168170

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

0 commit comments

Comments
 (0)