diff --git a/.circleci/config.yml b/.circleci/config.yml index a5f38c020..4ea8ec413 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,11 +165,11 @@ workflows: - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.13 - scalajs_version: 1.4.0 + scalajs_version: 1.5.0 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.4 - scalajs_version: 1.4.0 + scalajs_version: 1.5.0 - scalanative_job: name: native0.4_2.12 scala_version: 2.12.13 diff --git a/.travis.yml b/.travis.yml index 4778e5ee8..397aa4751 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.4.0 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.5.0 ADOPTOPENJDK=8 - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=15 diff --git a/project/plugins.sbt b/project/plugins.sbt index fcf01a639..16f79e89f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.4.0") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.5.0") val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.4.0")