Repository: tapestry-5 Updated Branches: refs/heads/master 78ff4456f -> a32af3d85
Revert "upgrade Gradle wrapper" This reverts commit 78ff4456f5e08c513999660af53b1663a659d169. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a32af3d8 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a32af3d8 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a32af3d8 Branch: refs/heads/master Commit: a32af3d856aa19126ebc560c12352abdbd9d069b Parents: 78ff445 Author: Jochen Kemnade <[email protected]> Authored: Mon Sep 12 10:46:35 2016 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Mon Sep 12 10:46:35 2016 +0200 ---------------------------------------------------------------------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 52818 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 5 ----- gradlew.bat | 6 ++++++ 5 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a32af3d8/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index f031805..c1db6cc 100755 --- a/build.gradle +++ b/build.gradle @@ -418,7 +418,7 @@ task continuousIntegration { } task wrapper(type: Wrapper) { - gradleVersion = '3.0' + gradleVersion = '2.14.1' description "Regenerates the Gradle Wrapper files" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a32af3d8/gradle/wrapper/gradle-wrapper.jar ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index deedc7f..3baa851 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/a32af3d8/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d77fdb..2eff010 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 12 09:43:42 CEST 2016 +#Wed Jul 20 15:08:04 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a32af3d8/gradlew ---------------------------------------------------------------------- diff --git a/gradlew b/gradlew index 9aa616c..27309d9 100755 --- a/gradlew +++ b/gradlew @@ -161,9 +161,4 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# 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 - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a32af3d8/gradlew.bat ---------------------------------------------------------------------- diff --git a/gradlew.bat b/gradlew.bat index e95643d..f6d5974 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,6 +49,7 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line
