diff options
| author | Joffrey BION <joffrey.bion@gmail.com> | 2017-03-14 00:58:34 +0100 |
|---|---|---|
| committer | Joffrey BION <joffrey.bion@gmail.com> | 2017-03-14 00:58:34 +0100 |
| commit | 7bf8fe3ea7f48c4c45e74308ea58829a9b5a78b7 (patch) | |
| tree | 596e992a0225e474b16dc4945e595f5eb9d73ca2 | |
| parent | Add checkstyle configuration (diff) | |
| download | seven-wonders-7bf8fe3ea7f48c4c45e74308ea58829a9b5a78b7.tar.gz seven-wonders-7bf8fe3ea7f48c4c45e74308ea58829a9b5a78b7.tar.bz2 seven-wonders-7bf8fe3ea7f48c4c45e74308ea58829a9b5a78b7.zip | |
Update gradle wrapper to 3.4.1
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 52928 -> 54212 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rwxr-xr-x | gradlew | 19 |
3 files changed, 13 insertions, 10 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 6ffa2378..9fdc241d 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 20006123..db4ea351 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 08 20:09:54 CET 2016 +#Tue Mar 14 00:57:11 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,16 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# 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 -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" |