svn commit: r1776532 - in /ofbiz/trunk: gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties gradlew gradlew.bat

[Taher Alkhateeb]

Author: taher
Date: Fri Dec 30 09:46:07 2016
New Revision: 1776532

URL: http://svn.apache.org/viewvc?rev=1776532&view=rev
Log:
Improved: upgrade gradle to version 3.2.1
(OFBIZ-9160)

Modified:
    ofbiz/trunk/gradle/wrapper/gradle-wrapper.jar
    ofbiz/trunk/gradle/wrapper/gradle-wrapper.properties
    ofbiz/trunk/gradlew
    ofbiz/trunk/gradlew.bat

Modified: ofbiz/trunk/gradle/wrapper/gradle-wrapper.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/gradle/wrapper/gradle-wrapper.jar?rev=1776532&r1=1776531&r2=1776532&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/trunk/gradle/wrapper/gradle-wrapper.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/gradle/wrapper/gradle-wrapper.properties?rev=1776532&r1=1776531&r2=1776532&view=diff
==============================================================================
--- ofbiz/trunk/gradle/wrapper/gradle-wrapper.properties (original)
+++ ofbiz/trunk/gradle/wrapper/gradle-wrapper.properties Fri Dec 30 09:46:07 2016
@@ -1,6 +1,6 @@
-#Tue Jun 28 11:26:40 AST 2016
+#Tue Dec 27 13:23:07 AST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

Modified: ofbiz/trunk/gradlew
URL: http://svn.apache.org/viewvc/ofbiz/trunk/gradlew?rev=1776532&r1=1776531&r2=1776532&view=diff
==============================================================================
--- ofbiz/trunk/gradlew (original)
+++ ofbiz/trunk/gradlew Fri Dec 30 09:46:07 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 #####################################################################
 ##  Gradle start up script for UN*X
@@ -169,11 +169,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 "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

Modified: ofbiz/trunk/gradlew.bat
URL: http://svn.apache.org/viewvc/ofbiz/trunk/gradlew.bat?rev=1776532&r1=1776531&r2=1776532&view=diff
==============================================================================
--- ofbiz/trunk/gradlew.bat (original)
+++ ofbiz/trunk/gradlew.bat Fri Dec 30 09:46:07 2016
@@ -64,7 +64,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.
@@ -75,11 +74,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