diff --git a/.travis.yml b/.travis.yml index 8d9e0c89..264765ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,16 @@ language: scala scala: - 0.25.0-RC1 - 2.11.12 - - 2.12.10 + - 2.12.11 - 2.13.2 env: - ADOPTOPENJDK=8 SCALAJS_VERSION= - - ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.33 - ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.0 - ADOPTOPENJDK=11 SCALAJS_VERSION= matrix: exclude: - - scala: 0.25.0-RC1 - env: ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.33 - scala: 0.25.0-RC1 env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.1.0 include: diff --git a/project/plugins.sbt b/project/plugins.sbt index c12a9328..9651a40c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.33") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0") val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")