Skip to content
This repository was archived by the owner on Jan 25, 2021. It is now read-only.

Commit 4ab38fb

Browse files
committed
testing against gradle 3.2
1 parent 534a31c commit 4ab38fb

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
ext {
19-
gradleVersions = '3.0,3.1'
19+
gradleVersions = '3.0,3.1,3.2'
2020
androidGradleBuildVersion = '2.2.0-beta1'
2121
androidCompileSdkVersion = 'android-24'
2222
androidBuildToolsVersion = '24.0.0'
@@ -223,6 +223,6 @@ jacocoTestReport.dependsOn test
223223
check.dependsOn jacocoTestReport
224224

225225
task wrapper(type: Wrapper) {
226-
gradleVersion = '3.1'
226+
gradleVersion = '3.2'
227227
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
228228
}

gradle/wrapper/gradle-wrapper.jar

1.27 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Sep 20 20:49:22 EDT 2016
1+
#Mon Nov 14 20:03:10 EST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip

gradlew

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -154,16 +154,18 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
160-
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
157+
# Escape application args
158+
for s in "${@}" ; do
159+
s=\"$s\"
160+
APP_ARGS=$APP_ARGS" "$s
161+
done
162+
163+
# Collect all arguments for the java command, following the shell quoting and substitution rules
164+
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
163165

164166
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165-
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
167+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
166168
cd "$(dirname "$0")"
167169
fi
168170

169-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
171+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)