diff --git a/.travis.yml b/.travis.yml index 8386ab97..5ae7ef11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,13 +43,13 @@ jdk: scala: - 2.11.12 - - 2.12.7 + - 2.12.8 - 2.13.0-M5 matrix: exclude: - jdk: openjdk11 - env: SCALAJS_VERSION=0.6.25 + env: SCALAJS_VERSION=0.6.26 - jdk: openjdk11 env: SCALAJS_VERSION=1.0.0-M6 - scala: 2.11.12 @@ -58,7 +58,7 @@ matrix: jdk: oraclejdk8 - scala: 2.11.12 jdk: openjdk11 - - scala: 2.12.7 + - scala: 2.12.8 jdk: openjdk6 - scala: 2.13.0-M5 jdk: openjdk6 diff --git a/build.sbt b/build.sbt index 01f765e6..21fb89ec 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import ScalaModulePlugin._ import sbtcrossproject.crossProject -crossScalaVersions in ThisBuild := List("2.12.7", "2.11.12", "2.13.0-M5") +crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-M5") lazy val root = project.in(file(".")) .aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`) 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