diff --git a/.circleci/config.yml b/.circleci/config.yml index c19e71ba3..ed5acaf44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,11 +131,11 @@ workflows: - scalajs_job: name: sjs0.6_2.12 scala_version: 2.12.10 - scalajs_version: 0.6.33 + scalajs_version: 1.1.1 - scalajs_job: name: sjs0.6_2.13 scala_version: 2.13.1 - scalajs_version: 0.6.33 + scalajs_version: 1.1.1 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.10 diff --git a/.travis.yml b/.travis.yml index 5876bfbd9..839c5c165 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8 - SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=13 @@ -19,7 +19,7 @@ env: matrix: exclude: - scala: 0.27.0-RC1 - env: SCALAJS_VERSION=0.6.33 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=1.1.1 ADOPTOPENJDK=8 - scala: 0.27.0-RC1 env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 0bae7a232..46a45723d 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.1") addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")