From c04859c31dc62cc221a583067b18a3a4b997a2ea Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 15 May 2020 22:47:43 +0200 Subject: [PATCH 1/2] Update sbt-scalajs, scalajs-compiler to 1.1.0 --- .travis.yml | 2 +- project/MySettings.scala | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3ac23626..7db87379e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: - TRAVIS_NODE_VERSION="12.16.1" JOB_NAME="test" matrix: - SCALAJS_VERSION="0.6.32" - - SCALAJS_VERSION="1.0.1" + - SCALAJS_VERSION="1.1.0" script: - sbt ++$TRAVIS_SCALA_VERSION test diff --git a/project/MySettings.scala b/project/MySettings.scala index 0e4696dc0..386bdd505 100644 --- a/project/MySettings.scala +++ b/project/MySettings.scala @@ -57,7 +57,7 @@ object MySettings { lazy val commonScalaJsSettings = Seq( scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ => - Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.1").startsWith("0.6.") + Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.0").startsWith("0.6.") }, scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9bcc16ee9..3832d4e19 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.1") + Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") From 731ac3703a2107cd7616297ff58555633afa3de3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 17 May 2020 04:16:56 +0200 Subject: [PATCH 2/2] Update sbt-scalajs, scalajs-compiler to 1.1.0 --- project/MySettings.scala | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/MySettings.scala b/project/MySettings.scala index bb712bdb6..a394ad5b7 100644 --- a/project/MySettings.scala +++ b/project/MySettings.scala @@ -57,7 +57,7 @@ object MySettings { lazy val commonScalaJsSettings = Seq( scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ => - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.0.1").startsWith("0.6.") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0").startsWith("0.6.") }, scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9c872c659..ef0cafd6f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.0.1") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")