Merge pull request #263 from ashawley/update-scalajs

Update Scala.js to 0.6.25 and 1.0.0-M5

Author: SethTisue

.travis.yml

@@ -29,15 +29,17 @@ env:
   matrix:
     # The empty SCALAJS_VERSION will only compile for the JVM
     - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.23
-    - SCALAJS_VERSION=1.0.0-M3
+    - SCALAJS_VERSION=0.6.25
+    - SCALAJS_VERSION=1.0.0-M5
 
 matrix:
   exclude:
     - jdk: oraclejdk10
-      env: SCALAJS_VERSION=0.6.23
+      env: SCALAJS_VERSION=0.6.25
     - jdk: oraclejdk10
-      env: SCALAJS_VERSION=1.0.0-M3
+      env: SCALAJS_VERSION=1.0.0-M5
+    - scala: 2.11.12
+      env: SCALAJS_VERSION=1.0.0-M5
     - scala: 2.11.12
       jdk: oraclejdk8
     - scala: 2.11.12

build.sbt

@@ -19,7 +19,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
     scalacOptions in Test  += "-Xxml:coalescing",
 
     mimaPreviousVersion := {
-      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M3") None // No such release yet
+      if (System.getenv("SCALAJS_VERSION") == "1.0.0-M5") None // No such release yet
       else Some("1.1.0")
     },
 

project/plugins.sbt

@@ -6,8 +6,8 @@ else
   Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")