diff options
Diffstat (limited to 'examples/android')
| -rw-r--r-- | examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar | bin | 54224 -> 54212 bytes | |||
| -rw-r--r-- | examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rwxr-xr-x | examples/android/helloworld/gradlew | 11 | ||||
| -rw-r--r-- | examples/android/routeguide/gradle/wrapper/gradle-wrapper.jar | bin | 54224 -> 54212 bytes | |||
| -rw-r--r-- | examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rwxr-xr-x | examples/android/routeguide/gradlew | 11 |
6 files changed, 16 insertions, 14 deletions
diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar Binary files differindex d6e2637af..459344875 100644 --- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar +++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties index 30073c3a4..a5a61008e 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 4ef3a871f..4453ccea3 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 Binary files differindex d6e2637af..459344875 100644 --- a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.jar +++ b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.jar diff --git a/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties b/examples/android/routeguide/gradle/wrapper/gradle-wrapper.properties index e15796cb3..a5a61008e 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 4ef3a871f..4453ccea3 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 |