Update gradle to 3.0.

This commit is contained in:
Peter Johnson
2016-08-21 08:23:54 -07:00
parent b2831347bc
commit c25c62e0af
6 changed files with 8 additions and 10 deletions

View File

@@ -135,5 +135,5 @@ build.dependsOn cameraserverSourceZip
apply from: 'publish.gradle'
task wrapper(type: Wrapper) {
gradleVersion = '2.14'
gradleVersion = '3.0'
}

View File

@@ -118,7 +118,6 @@ if (buildArm) {
project(':native') {
apply plugin: 'cpp'
task check
apply from: "${rootDir}/toolchains/native.gradle"

Binary file not shown.

View File

@@ -1,6 +1,6 @@
#Fri Jul 22 19:04:27 PDT 2016
#Sat Aug 20 17:01:11 PDT 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-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

5
gradlew vendored
View File

@@ -161,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

6
gradlew.bat vendored
View File

@@ -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