From 9a89d31824a77a7fd248d662c6725e71a42187c2 Mon Sep 17 00:00:00 2001 From: arnlaugsson Date: Tue, 18 Oct 2016 20:20:29 +0000 Subject: [PATCH] Upgrade to Gradle 3.1 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 52928 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 51 +++++++++++++---------- gradlew.bat | 14 ++----- 5 files changed, 37 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index 522a6b8..42528f1 100644 --- a/build.gradle +++ b/build.gradle @@ -13,5 +13,5 @@ dependencies { testCompile 'junit:junit:4.11' compile 'net.joningi:icndb-java-api:1.0' - compile 'com.sparkjava:spark-core:2.3' + compile 'com.sparkjava:spark-core:2.5' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..6ffa237849ef3607e39c3b334a92a65367962071 100644 GIT binary patch delta 13231 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eab825a..1f9fd6c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 25 10:50:15 GMT 2015 +#Tue Oct 18 20:18:54 GMT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/gradlew b/gradlew index 97fac78..9aa616c 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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - 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 @@ -157,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 "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 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,10 +46,9 @@ 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 :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