Browse Source

Upgrade build to Gradle 3.0

Issue: SPR-14569
pull/1135/head
Sam Brannen 8 years ago
parent
commit
669fd80854
  1. 2
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 4
      gradle/wrapper/gradle-wrapper.properties
  4. 5
      gradlew
  5. 6
      gradlew.bat

2
build.gradle

@ -1348,7 +1348,7 @@ configure(rootProject) { @@ -1348,7 +1348,7 @@ configure(rootProject) {
task wrapper(type: Wrapper) {
description = "Generates gradlew[.bat] scripts"
gradleVersion = "2.14.1"
gradleVersion = '3.0'
doLast() {
def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m"

BIN
gradle/wrapper/gradle-wrapper.jar vendored

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#Mon Jul 18 11:34:32 CEST 2016
#Mon Aug 15 21:03:22 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

5
gradlew vendored

@ -162,4 +162,9 @@ function splitJvmOpts() { @@ -162,4 +162,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

@ -50,7 +50,6 @@ goto fail @@ -50,7 +50,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.
@ -61,11 +60,6 @@ set _SKIP=2 @@ -61,11 +60,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

Loading…
Cancel
Save