Permalink
Browse files

Upgrade gradle wrapper to 3.1

  • Loading branch information...
1 parent b785e86 commit cd57fc85d78a922952dc8505e65337884c9d8162 @kaklakariada committed Oct 8, 2016
Showing with 7 additions and 13 deletions.
  1. +0 −5 build.gradle
  2. BIN gradle/wrapper/gradle-wrapper.jar
  3. +2 −2 gradle/wrapper/gradle-wrapper.properties
  4. +5 −0 gradlew
  5. +0 −6 gradlew.bat
View
@@ -80,11 +80,6 @@ license {
eclipse {
classpath {
downloadSources = true
- containers.remove('org.eclipse.jdt.launching.JRE_CONTAINER')
- def javaVersion = project.sourceCompatibility.toString()
- def container = "org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-$javaVersion"
- logger.info "Using container $container for $project"
- containers container
}
jdt.file {
beforeMerged { jdt ->
Binary file not shown.
@@ -1,6 +1,6 @@
-#Sat Jun 25 18:34:29 CEST 2016
+#Sat Oct 08 10:13:14 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
View
@@ -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 "$@"
View
@@ -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 cd57fc8

Please sign in to comment.