From 23a8cbad695e1eb27bd4abf5f2c4ed9b3424d8ff Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 9 May 2019 12:28:27 -0700 Subject: [PATCH 1/2] allow JDK 11 build --- build.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 326c1a1e..9720f214 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,10 @@ scalaVersionsByJvm in ThisBuild := { 6 -> List(v211 -> true), 7 -> List(v211 -> false), 8 -> List(v212 -> true, v213 -> true, v211 -> false), - 9 -> List(v212 -> false, v213 -> false, v211 -> false) + 9 -> List(v212 -> false, v213 -> false, v211 -> false), + 10 -> List(v212 -> false, v213 -> false, v211 -> false), + 11 -> List(v212 -> false, v213 -> false, v211 -> false), + 12 -> List(v212 -> false, v213 -> false, v211 -> false) ) } From d99be7e7df295f8a99ff1fe7f39de2cdd18400f3 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 22 Oct 2019 18:24:55 -0700 Subject: [PATCH 2/2] allow JDK 13/14 build note that the Travis-CI changes don't make the JDK 6 build work, but they do allow the JDK 8 one to run --- .travis.yml | 7 +------ build.sbt | 4 +++- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dd07616..eb7e3ae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,14 +23,9 @@ env: script: admin/build.sh -addons: - apt: - packages: - - openjdk-6-jdk - jdk: - openjdk6 - - oraclejdk8 + - openjdk8 notifications: email: diff --git a/build.sbt b/build.sbt index 9720f214..cfef969a 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,9 @@ scalaVersionsByJvm in ThisBuild := { 9 -> List(v212 -> false, v213 -> false, v211 -> false), 10 -> List(v212 -> false, v213 -> false, v211 -> false), 11 -> List(v212 -> false, v213 -> false, v211 -> false), - 12 -> List(v212 -> false, v213 -> false, v211 -> false) + 12 -> List(v212 -> false, v213 -> false, v211 -> false), + 13 -> List(v212 -> false, v213 -> false, v211 -> false), + 14 -> List(v212 -> false, v213 -> false, v211 -> false) ) } 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6fcd9b89..dcaba16f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")