From 810b2d0b9685880b3ff20214910e344d742a9a67 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 6 Apr 2017 10:26:45 -0700
Subject: [PATCH] all: Update to gradle 3.4.1

Among build speed improvements and VS 2015 support, it also improves
quote handling in gradlew.
---
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 54224 -> 54212 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/android/helloworld/gradlew           |  11 ++++++-----
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 54224 -> 54212 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/android/routeguide/gradlew           |  11 ++++++-----
 examples/gradle/wrapper/gradle-wrapper.jar    | Bin 54224 -> 54212 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/gradlew                              |  11 ++++++-----
 .../thrift/gradle/wrapper/gradle-wrapper.jar  | Bin 54224 -> 54212 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   4 ++--
 examples/thrift/gradlew                       |  11 ++++++-----
 gradle/wrapper/gradle-wrapper.jar             | Bin 54224 -> 54212 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 gradlew                                       |  11 ++++++-----
 15 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar
index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..459344875602759f71ff759b0850903f98a9a27b 100644
GIT binary patch
delta 4761
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
VQN#Qx=uyZpy_1(C=PC04{{doYB^Cex

delta 4751
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
OI4BSn=+L7E*!n*SfB9Gd

diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
index 30073c3a447..a5a61008e11 100644
--- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 15:29:01 PST 2016
+#Thu Apr 06 10:19:48 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/examples/android/helloworld/gradlew b/examples/android/helloworld/gradlew
index 4ef3a871f2e..4453ccea33d 100755
--- a/examples/android/helloworld/gradlew
+++ b/examples/android/helloworld/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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
diff --git a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.jar b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.jar
index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..459344875602759f71ff759b0850903f98a9a27b 100644
GIT binary patch
delta 4761
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
VQN#Qx=uyZpy_1(C=PC04{{doYB^Cex

delta 4751
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
OI4BSn=+L7E*!n*SfB9Gd

diff --git a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
index e15796cb397..a5a61008e11 100644
--- a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 15:29:19 PST 2016
+#Thu Apr 06 10:19:48 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/examples/android/routeguide/gradlew b/examples/android/routeguide/gradlew
index 4ef3a871f2e..4453ccea33d 100755
--- a/examples/android/routeguide/gradlew
+++ b/examples/android/routeguide/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..459344875602759f71ff759b0850903f98a9a27b 100644
GIT binary patch
delta 4761
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
VQN#Qx=uyZpy_1(C=PC04{{doYB^Cex

delta 4751
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
OI4BSn=+L7E*!n*SfB9Gd

diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
index 48b5ceea3b1..a5a61008e11 100644
--- a/examples/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 15:32:41 PST 2016
+#Thu Apr 06 10:19:48 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/examples/gradlew b/examples/gradlew
index 4ef3a871f2e..4453ccea33d 100755
--- a/examples/gradlew
+++ b/examples/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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
diff --git a/examples/thrift/gradle/wrapper/gradle-wrapper.jar b/examples/thrift/gradle/wrapper/gradle-wrapper.jar
index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..459344875602759f71ff759b0850903f98a9a27b 100644
GIT binary patch
delta 4761
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
VQN#Qx=uyZpy_1(C=PC04{{doYB^Cex

delta 4751
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
OI4BSn=+L7E*!n*SfB9Gd

diff --git a/examples/thrift/gradle/wrapper/gradle-wrapper.properties b/examples/thrift/gradle/wrapper/gradle-wrapper.properties
index 48b5ceea3b1..a5a61008e11 100644
--- a/examples/thrift/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/thrift/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 15:32:41 PST 2016
+#Thu Apr 06 10:19:48 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/examples/thrift/gradlew b/examples/thrift/gradlew
index 4ef3a871f2e..4453ccea33d 100755
--- a/examples/thrift/gradlew
+++ b/examples/thrift/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..459344875602759f71ff759b0850903f98a9a27b 100644
GIT binary patch
delta 4761
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
VQN#Qx=uyZpy_1(C=PC04{{doYB^Cex

delta 4751
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
OI4BSn=+L7E*!n*SfB9Gd

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17b2993f7f0..a5a61008e11 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 16 15:29:58 PST 2016
+#Thu Apr 06 10:19:48 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/gradlew b/gradlew
index 4ef3a871f2e..4453ccea33d 100755
--- a/gradlew
+++ b/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+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