You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2017/03/03 06:24:57 UTC
[4/4] tapestry-5 git commit: upgade Gradle wrapper
upgade Gradle wrapper
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d6d1bf13
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d6d1bf13
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d6d1bf13
Branch: refs/heads/master
Commit: d6d1bf134288e55ebb59b760b24391a80697fdec
Parents: 6cbf779
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Fri Mar 3 06:51:20 2017 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Fri Mar 3 06:55:29 2017 +0100
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 54208 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 19 +++++++++++--------
4 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 753de69..d1cea20 100755
--- a/build.gradle
+++ b/build.gradle
@@ -424,7 +424,7 @@ task continuousIntegration {
}
task wrapper(type: Wrapper) {
- gradleVersion = '3.1'
+ gradleVersion = '3.4'
description "Regenerates the Gradle Wrapper files"
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 6ffa237..e1508cd 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c558c90..f5f87ea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 22 12:09:59 CEST 2016
+#Fri Mar 03 06:51:16 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d6d1bf13/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 9aa616c..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -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" "$@"