diff --git a/.travis.yml b/.travis.yml index 5b51cde..1e8c0e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,20 @@ language: scala scala: - - 2.12.7 -jdk: - - oraclejdk8 - - openjdk11 + - 2.12.8 + +before_install: + - curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh + env: + global: + - JABBA_HOME=$HOME/.jabba matrix: - - SCRIPT=scripts/test-sbt - - SCRIPT=scripts/test-gradle -script: - - $SCRIPT -cache: - directories: - - "$HOME/.ivy2/cache" - - "$HOME/.gradle/caches" -before_cache: - - rm -rf $HOME/.ivy2/cache/com.typesafe.play/* - - rm -rf $HOME/.ivy2/cache/scala_*/sbt_*/com.typesafe.play/* - - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print0 | xargs -n10 -0 rm + # There is no concise way to specify multi-dimensional build matrix: + # https://github.com/travis-ci/travis-ci/issues/1519 + - SCRIPT=scripts/test-sbt TRAVIS_JDK=adopt@1.8.192-12 + - SCRIPT=scripts/test-sbt TRAVIS_JDK=adopt@1.11.0-1 + - SCRIPT=scripts/test-gradle TRAVIS_JDK=adopt@1.8.192-12 + - SCRIPT=scripts/test-gradle TRAVIS_JDK=adopt@1.11.0-1 # Exclude some combinations from build matrix. See: # https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix @@ -27,14 +24,27 @@ matrix: # Current release of Gradle still does not supports Play 2.7.x releases # As soon as there is a release of Gradle that fixes that, we can then # remove this allowed failure. - - env: SCRIPT=scripts/test-gradle + - env: SCRIPT=scripts/test-gradle TRAVIS_JDK=adopt@1.8.192-12 + - env: SCRIPT=scripts/test-gradle TRAVIS_JDK=adopt@1.11.0-1 # Java 11 is still not fully supported. It is good that we are already # testing our sample applications to better discover possible problems # but we can allow failures here too. - - jdk: openjdk11 + - env: SCRIPT=scripts/test-sbt TRAVIS_JDK=adopt@1.11.0-1 + +install: + - $JABBA_HOME/bin/jabba install $TRAVIS_JDK + - unset _JAVA_OPTIONS + - export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version -# See https://blog.travis-ci.com/2014-03-13-slack-notifications/ -# created with travis encrypt command line tool -notifications: - slack: - secure: ltgIyHnWM/apr/VaeX9diKH6o4chcZO+1SUmjTuJIoRJCMdKjv0TY4k+HMabLwe/4ZXhzZ/nq2VhbUZDnvsL90b9MfeDjcvf9ku20MSNuiDvZZC3yYgj7I+x3Y2kbVZcugTPbl2Ig0UGqSGCuVyqYnLSBPQ1LOn/gug3hGMqcJ5vb40g1zRPG842yZjJ5UTo5suitPc63YYuAcddoBnBCqAez+2Z8W4Gf6vu27DonTEcisiu2MmWD2X2AqmahuZi7TE0c3o3CBrrY38N+EPvonuBHSO03vaCF0XvabOxALHzLQDG6byw/u4anGXpa0/dhrT6gglb31y10hzxH6yfb2p9a/LNrY4gKyz4bzEBplTb7uogaJCJpYiQDdINxRGkVdbHRDyuAsEo+Y7y6pW60oEOLUuLmvKSAjPNp5k1o2Mmx13O1SBbAxP6YSiZStptKYko8BlSEIsBSvhXaZuIcoAeMgypcxyemZWi9QBIH+SNgueIdGCTBZ5lQe+nBLhjft+0hFnV9mJMazGmvaue5UGukalLhHgyNhnGdTrC1QVjU53iDY95GY3QJhcdnXr6cCvEAZvHwefjnTLCiKqNAgG77Y3w8CH5vyFwoS/dYFzl08urIxblxL8bUrI5vgNrt38gW/vKHxXZBzj6c80xyfdVGcdex/m/jI5BllLMH3A= +script: + - $SCRIPT + +before_cache: + - find $HOME/.ivy2 -name "ivydata-*.properties" -delete + - find $HOME/.sbt -name "*.lock" -delete + +cache: + directories: + - "$HOME/.ivy2/cache" + - "$HOME/.gradle/caches" + - "$HOME/.jabba/jdk" diff --git a/build.sbt b/build.sbt index 95ce385..a5a0d3a 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val gatlingVersion = "2.3.1" inThisBuild( List( - scalaVersion := "2.12.7", + scalaVersion := "2.12.8", dependencyOverrides := Seq( "org.codehaus.plexus" % "plexus-utils" % "3.0.18", "com.google.code.findbugs" % "jsr305" % "3.0.1", @@ -45,4 +45,4 @@ testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) javacOptions ++= Seq( "-Xlint:unchecked", "-Xlint:deprecation" -) \ No newline at end of file +) diff --git a/project/build.properties b/project/build.properties index 5620cc5..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.1 +sbt.version=1.2.8