Skip to content

Commit

Permalink
Update Gradle wrapper to 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
friederbluemle authored and JesusFreke committed May 15, 2017
1 parent dd11921 commit 58a4809
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -204,6 +204,6 @@ buildscript {
} }


task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '3.1' gradleVersion = '3.5'
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
} }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 28 23:22:26 AEST 2016 #Wed May 03 00:04:05 SGT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
19 changes: 11 additions & 8 deletions gradlew
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh


############################################################################## ##############################################################################
## ##
Expand Down Expand Up @@ -154,16 +154,19 @@ if $cygwin ; then
esac esac
fi fi


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


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


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

0 comments on commit 58a4809

Please sign in to comment.