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

Simplify scalacOptions for Scala.js 0.6 #251

Merged
merged 1 commit into from
May 29, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/MySettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0").startsWith("0.6.")
Option(System.getenv("SCALAJS_VERSION")).exists(_.startsWith("0.6."))
},
scalaJSLinkerConfig ~= {
_.withModuleKind(ModuleKind.CommonJSModule)
Expand Down