From a8c5e729d4a155a6b508f95296683d1f39789a36 Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 16 Sep 2016 12:11:39 +0200 Subject: [PATCH] Updated build system and Travis CI config --- .travis.yml | 23 +++++++--- gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 53319 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 52 +++++++++++------------ gradlew.bat | 8 ++-- 5 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3919d9ad9..132870351 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,20 @@ +sudo: required +dist: trusty + language: java - -# Disable the install step because gradlew assemble would actually run the entirety of the build -install: true - -script: - - ./gradlew setupCiWorkspace build - jdk: - oraclejdk8 + - openjdk8 +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + - rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar + - rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + +install: "./gradlew setupCIWorkspace" +script: "./gradlew build test" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..d3b83982b9b1bccad955349d702be9b884c6e049 100644 GIT binary patch delta 5489 zcmZo$%zS(SGhcu=GYc030|y6#jn_GkiF~TOAX?m5Vz~nY14HOUhhQF`rp8qxO4;=7R(5Um z+pYVzUibU=>vz9B9$Aikf`9BvVg!w52?OymGx1P0_ z>sf8ap(WyhmUJUw-#)zJZJE=KBFu`9yMkYeTF7fG z$&Oeksl2qEo$K9JY(rtaO6QA%PBJ+HmD{nFN zx*pNnJk2Le?(lRy%danmz8gv>zSMYJZT?sO`QoRH>Z`hAa(5nU;5AfE%<{XI*7GvG zxc1SEeKV$ReO%SpF>iT@jmGpG4>Zbz2vY3~Qw5_l2u(9OKh>d)BdFK~t=#{9|F! z`Hzf6=Ra=j(*LluX?;jdeQ!PsoBzEaCf%viBOG*>_U7h^tk=H%$Lw`LC1c9#)5TnK zEX$^To9a^WNK;$6`DBStk~`DY?@0?zg{YXuH0p1=z4=4jajh8@)=XC&l-ROU0+J&A zZe82mF?HMAGpin|{A|0bG=1x8|Ceb_OcAFzep^kBJuh;-oK49zvPktw zr`})w-|jO_r|xBoIhUnHFtKUIx#l3{f} z|G@6Z`$`Y{)Y^M5+#7;)84Ma6`*D>Rg2pLuJc`V`Lc4`GnpufMW*fBCf07T zmpr%dF~eM@ixZjWh*h+_4%x+W>~38-U;3>-mL>LwK3sgVQ>N;eZ5{vC`4=poe18&~ z{?hh@h9v02jM->JY$l!*p�KG943B2Yf_ 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 I2&y?40MBmCbpQYW delta 5811 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 \(.*\)$'` + 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,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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. @@ -90,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 @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/gradlew.bat b/gradlew.bat index a846e3f7b..832fdb607 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="-Xmx2G" - 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