diff --git a/.travis.yml b/.travis.yml index 886a8b6..a8d05e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,13 @@ language: scala +# Needed for openjdk6 +dist: precise +sudo: required +addons: + hosts: + - localhost + hostname: localhost.local + env: global: # PGP_PASSPHRASE @@ -9,11 +17,10 @@ env: # SONA_PASS - secure: "E6OE1MoZ4VQHRNtEyyKfmnj8Bj7uGpgHLmlvJR/iy7qdxBbNA8cEz/Qs64uTft5zfZ9bJsQhiuxLcTtFKYKFP4qvExz8FyilhmUwKjD5Eux4FAeBjDBeXBETM1JYFB+JYP9l8dcQecMeGpd46I52pLjYYmNyQQ1YpOvK29GIQLA=" -before_install: - - sudo hostname "$(hostname | cut -c1-63)" - - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts - - sudo mv /tmp/hosts /etc/hosts script: + # work around https://github.com/travis-ci/travis-ci/issues/9713 + - if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi + - java -version - admin/build.sh addons: @@ -24,7 +31,9 @@ addons: jdk: - openjdk6 - oraclejdk8 + - openjdk11 notifications: email: - adriaan.moors@lightbend.com - danslapman@gmail.com + - seth.tisue@lightbend.com diff --git a/build.sbt b/build.sbt index 6d985b3..3bba094 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ import ScalaModulePlugin._ // plugin logic of build based on https://github.com/retronym/boxer scalaVersionsByJvm in ThisBuild := { - val j67 = List("2.11.8", "2.11.11") - val j89 = List("2.12.0", "2.12.1", "2.12.2", "2.13.0-M1") + val j67 = List("2.11.12") + val j89 = List("2.12.6", "2.12.8", "2.13.0-M1") // Map[JvmVersion, List[(ScalaVersion, UseForPublishing)]] Map( 6 -> j67.map(_ -> true), @@ -13,7 +13,8 @@ scalaVersionsByJvm in ThisBuild := { 8 -> j89.map(_ -> true), 9 -> j89.map(_ -> false), 10 -> j89.map(_ -> false), - 11 -> j89.map(_ -> false) + 11 -> j89.map(_ -> false), + 12 -> j89.map(_ -> false) ) } diff --git a/project/build.properties b/project/build.properties index 133a8f1..8e682c5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=0.13.18