Update gradle wrapper

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d3b83982b9b1bccad955349d702be9b884c6e049..6ffa237849ef3607e39c3b334a92a65367962071 100644 (file)
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ea216ae069bb9997f45403e0545c32b5697737f..eb30d113c7385ca7737023c37ababc32eadf4223 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 17 23:09:52 CEST 2016
+#Thu Oct 27 10:45:20 CEST 2016

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

diff --git a/gradlew b/gradlew
index 27309d92314c57d6e442529f1362bafc8376feae..9aa616c273d8c0be67cb25eaac11e07209f5c034 100755 (executable)
--- 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"
 
 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 "$@"
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/gradlew.bat b/gradlew.bat
index f6d5974e72fdac64fbae9aeb32c28cb8b69a92d5..e95643d6a2ca62258464e83c72f5156dc941c609 100644 (file)
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants\r
 \r
 if not "%OS%" == "Windows_NT" goto win9xME_args\r
 @rem Get command-line arguments, handling Windows variants\r
 \r
 if not "%OS%" == "Windows_NT" goto win9xME_args\r

-if "%@eval[2+2]" == "4" goto 4NT_args\r

 \r
 :win9xME_args\r
 @rem Slurp the command line arguments.\r
 \r
 :win9xME_args\r
 @rem Slurp the command line arguments.\r


@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute\r
 \r
 set CMD_LINE_ARGS=%*\r
 if "x%~1" == "x" goto execute\r
 \r
 set CMD_LINE_ARGS=%*\r

-goto execute\r
-\r
-:4NT_args\r
-@rem Get arguments from the 4NT Shell from JP Software\r
-set CMD_LINE_ARGS=%$\r

 \r
 :execute\r
 @rem Setup the command line\r
 \r
 :execute\r
 @rem Setup the command line\r