From 7185acbbad0411e1e55c7fd2f069818e175c0f76 Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Sun, 2 Apr 2017 23:27:31 +0200 Subject: [PATCH] Bumped gradle version to 3.4.1 --- .../ch/dissem/gradle/GitFlowVersion.groovy | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 53637 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 46 ++++++++++-------- gradlew.bat | 8 +-- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy index 869d57e..19c469a 100644 --- a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy +++ b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy @@ -50,8 +50,8 @@ class GitFlowVersion implements Plugin { project.ext.isRelease = isRelease(project) project.version = getVersion(project) - project.task('version') << { - println "Version deduced from git: '${project.version}'" + project.task('version') { + doLast { println "Version deduced from git: '${project.version}'" } } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 05ef575b0cd0173fc735f2857ce4bd594ce4f6bd..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644 GIT binary patch delta 5515 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 U^p_eN)%O;BQ^`^b*X=p~2l_@f>i_@% delta 5722 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 gIK+ot+Mll

k@tn`#EOn=Sy-@99Xb-TWMF0Q* diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ebcdff0..0879999 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 12 11:52:04 CEST 2016 +#Sun Apr 02 23:05:26 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..27309d9 100755 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then diff --git a/gradlew.bat b/gradlew.bat index aec9973..f6d5974 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args