Permalink
Browse files

Upgrade to Gradle 3.0

  • Loading branch information...
sbrannen committed Aug 15, 2016
1 parent 9a6cbbc commit 255eca5b6471e9e0ff03afa47f1a2d0144cb9f0d
Showing with 11 additions and 17 deletions.
  1. +2 −2 .travis.yml
  2. +2 −7 build.gradle
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +2 −2 gradle/wrapper/gradle-wrapper.properties
  5. +5 −0 gradlew
  6. +0 −6 gradlew.bat
@@ -25,8 +25,8 @@ cache:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
# Update Gradle Wrapper instead of letting Travis execute './gradlew assemble' by default
install: ./gradlew wrapper --gradle-distribution-url=https://services.gradle.org/distributions-snapshots/gradle-3.0-20160702000020+0000-bin.zip
# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
install: ./gradlew -version
script:
- java -version
@@ -499,13 +499,8 @@ configure(rootProject) {
prepareGhPages.dependsOn(createCurrentDocsFolder)
task wrapper(type: Wrapper) {
// To build against Gradle 3.0 nightly builds, obtain the latest
// distribution URL (http://gradle.org/gradle-nightly-build/)
// and then execute the following from the command line, using
// the latest distribution URL:
// gradlew wrapper --gradle-distribution-url=https://services.gradle.org/distributions-snapshots/gradle-3.0-20160615000025+0000-bin.zip && gradlew -version && gradlew clean test
distributionUrl = 'https://services.gradle.org/distributions/gradle-2.14.1-bin.zip'
description = 'Generates gradlew and gradlew.bat scripts'
gradleVersion = '3.0'
}
}
BIN -506 Bytes (99%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,6 @@
#Mon Jul 18 12:10:57 CEST 2016
#Mon Aug 15 20:48:41 CEST 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
@@ -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 "$@"
@@ -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

0 comments on commit 255eca5

Please sign in to comment.