Merge pull request #251 from exoego/matrix

Simplify scalacOptions for Scala.js 0.6

Author: exoego

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)