From eff986bfc42c450ebca075a9a2b59940d5cd8e33 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Mon, 12 Dec 2016 19:22:33 +0100 Subject: [PATCH] [android] - update gradle wrapper and gradle plugin (#7381) --- platform/android/build.gradle | 4 ++-- .../android/gradle/wrapper/gradle-wrapper.jar | Bin 53324 -> 54227 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 ++-- platform/android/gradlew | 22 ++++++++++++------ platform/android/gradlew.bat | 6 ----- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 88253321e..9ba9210af 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2' classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1' } @@ -18,5 +18,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' + gradleVersion = '3.2.1' } diff --git a/platform/android/gradle/wrapper/gradle-wrapper.jar b/platform/android/gradle/wrapper/gradle-wrapper.jar index 3baa851b28c65f87dd36a6748e1a85cf360c1301..51288f9c2f05faf8d42e1a751a387ca7923882c3 100644 GIT binary patch delta 21182 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 delta 20194 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 PUQJ;!ao8D;5SIS{e7>Rm diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index 1a4f00cd3..20b2b0894 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ -#Wed Aug 17 09:21:12 EDT 2016 +#Mon Dec 12 10:58:15 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip -distributionSha256Sum=88a910cdf2e03ebbb5fe90f7ecf534fc9ac22e12112dc9a2fee810c598a76091 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip diff --git a/platform/android/gradlew b/platform/android/gradlew index 27309d923..4453ccea3 100755 --- a/platform/android/gradlew +++ b/platform/android/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,11 +154,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" "$@" diff --git a/platform/android/gradlew.bat b/platform/android/gradlew.bat index f6d5974e7..e95643d6a 100644 --- a/platform/android/gradlew.bat +++ b/platform/android/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