From 306b1ee274ebe9bc24363262b8028e5a641850ae Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:21:41 -0800 Subject: [PATCH 1/6] add openjdk11 to CI matrix --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 886a8b6..50ac133 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,9 @@ addons: jdk: - openjdk6 - oraclejdk8 + - openjdk11 notifications: email: - adriaan.moors@lightbend.com - danslapman@gmail.com + - seth.tisue@lightbend.com From 1c64e8befe6425a11e8d6c9681092e3b6fe11625 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:22:06 -0800 Subject: [PATCH 2/6] add Scala 2.11.12 and 2.12.8 to cross-build --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6d985b3..b76a9ca 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.8", "2.11.11", "2.11.12") + val j89 = List("2.12.0", "2.12.1", "2.12.2", "2.12.8", "2.13.0-M1") // Map[JvmVersion, List[(ScalaVersion, UseForPublishing)]] Map( 6 -> j67.map(_ -> true), From 855660700367aaa2795ed6d516eb31d8b577acb8 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:22:16 -0800 Subject: [PATCH 3/6] sbt 0.13.18 (was 0.13.17) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From aa82da46f534799181e2bfb191fb39e6dec5e168 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:22:24 -0800 Subject: [PATCH 4/6] allow building on JDK 12 --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b76a9ca..94d437e 100644 --- a/build.sbt +++ b/build.sbt @@ -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) ) } From ece5c5e5d113574bdcc2537d8ec16e0bcc03cbac Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:24:22 -0800 Subject: [PATCH 5/6] fix openjdk6 stuff in Travis-CI config the old way stopped working a while ago --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50ac133..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: From 47caeb1196157a582dd82b259174661e121c62fe Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 15:16:37 -0800 Subject: [PATCH 6/6] drop some older Scala versions from the cross-build --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 94d437e..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", "2.11.12") - val j89 = List("2.12.0", "2.12.1", "2.12.2", "2.12.8", "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),