Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 5a2d3b1

Browse files
authored
Merge pull request #215 from scala-steward/update/sbt-scalajs-1.1.0
Update sbt-scalajs, scalajs-compiler to 1.1.0
2 parents 6f47132 + 731ac37 commit 5a2d3b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

project/MySettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ object MySettings {
5757

5858
lazy val commonScalaJsSettings = Seq(
5959
scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ =>
60-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.0.1").startsWith("0.6.")
60+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0").startsWith("0.6.")
6161
},
6262
scalaJSLinkerConfig ~= {
6363
_.withModuleKind(ModuleKind.CommonJSModule)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.0.1")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.0")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")

0 commit comments

Comments
 (0)