You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2016/08/22 02:44:40 UTC
groovy git commit: use final version of gradle 3.0
Repository: groovy
Updated Branches:
refs/heads/master 47ebf7f2b -> f175e34b5
use final version of gradle 3.0
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f175e34b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f175e34b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f175e34b
Branch: refs/heads/master
Commit: f175e34b5df0e197fcd7ca599f00403174470b4a
Parents: 47ebf7f
Author: paulk <pa...@asert.com.au>
Authored: Mon Aug 22 12:44:15 2016 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Mon Aug 22 12:44:15 2016 +1000
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 53556 -> 52799 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 5 +++++
gradlew.bat | 6 ------
5 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/f175e34b/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 22c3c7a..79c2965 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,7 +146,7 @@ ext {
commonsHttpClientVersion = '3.1'
eclipseOsgiVersion = '3.9.1-v20140110-1610'
gparsVersion = '1.2.1'
- gradleVersion = '2.13'
+ gradleVersion = '3.0'
ivyVersion = '2.4.0'
jansiVersion = '1.13'
jarjarVersion = '1.3'
http://git-wip-us.apache.org/repos/asf/groovy/blob/f175e34b/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ca78035..df2bc38 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/groovy/blob/f175e34b/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5ea12f4..29164ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 29 16:46:03 AEST 2016
+#Mon Aug 22 12:20:46 AEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions-snapshots/gradle-3.0-20160715000024+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-3.0-20160715000024+0000-bin.zip
http://git-wip-us.apache.org/repos/asf/groovy/blob/f175e34b/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 27309d9..9aa616c 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ 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/groovy/blob/f175e34b/gradlew.bat
----------------------------------------------------------------------
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974..e95643d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ 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.
@@ -60,11 +59,6 @@ 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