Upgrade to Scala.js 0.6.22, drop 1.0.0-M1 and M2 in favor of M3.

Author: sjrd

.travis.yml

@@ -14,9 +14,12 @@ scala:
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=0.6.21
-  - SCALAJS_VERSION=1.0.0-M1
-  - SCALAJS_VERSION=1.0.0-M2
+  - SCALAJS_VERSION=0.6.22
+  - SCALAJS_VERSION=1.0.0-M3
+matrix:
+  exclude:
+    - scala: 2.10.7
+      env: SCALAJS_VERSION=1.0.0-M3
 
 cache:
   directories:

project/build.sbt

@@ -1,13 +1,7 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.22")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-
-{
-  if (scalaJSVersion != "1.0.0-M1")
-    addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
-  else
-    Nil
-}
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")