From 21f53d5c38c94b47ab626f633dd41ff74ea30764 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:05:30 -0800 Subject: [PATCH 1/4] Scala 2.12.8 (was 2.12.6) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2d10d0ac..fe03726c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import ScalaModulePlugin._ scalaModuleSettings scalaVersionsByJvm in ThisBuild := { - val v212 = "2.12.6" + val v212 = "2.12.8" val v213 = "2.13.0-M5" val allFalse = List(v212 -> false, v213 -> false) From 6d97790658be761b324dbb649a621f8d60612b5b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:06:09 -0800 Subject: [PATCH 2/4] allow building on JDK 12 (and don't allow 9 or 10) --- build.sbt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index fe03726c..21967fb8 100644 --- a/build.sbt +++ b/build.sbt @@ -9,9 +9,8 @@ scalaVersionsByJvm in ThisBuild := { val allFalse = List(v212 -> false, v213 -> false) Map( 8 -> List(v212 -> true, v213 -> true), - 9 -> allFalse, - 10 -> allFalse, - 11 -> allFalse + 11 -> allFalse, + 12 -> allFalse ) } From 11f31bbf2b27ac592154232ecaafa10000702ac9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:06:18 -0800 Subject: [PATCH 3/4] add openjdk11 to CI matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index acc16cc2..38ec1fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ script: - admin/build.sh jdk: - oraclejdk8 + - openjdk11 notifications: email: - jason.zaugg@lightbend.com From ee8fef05653a8d213e6ddaa7d9b1328d6bda5d59 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Feb 2019 14:08:03 -0800 Subject: [PATCH 4/4] 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 133a8f19..8e682c52 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=0.13.18