From a7302766b23b947b23b3ba4b0d8de8473618bd93 Mon Sep 17 00:00:00 2001 From: exoego Date: Fri, 29 May 2020 21:28:45 +0900 Subject: [PATCH] Simplify scalacOptions for Scala.js 0.6 --- project/MySettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/MySettings.scala b/project/MySettings.scala index a394ad5b7..48daaaf48 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.1.0").startsWith("0.6.") + Option(System.getenv("SCALAJS_VERSION")).exists(_.startsWith("0.6.")) }, scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)