Upgrades.

sjrd · sjrd · commit d00c5b3fa529 · 2018-07-03T13:31:41.000+02:00
* sbt-crossproject 0.5.0 (to support Scala.js 1.0.0-M5)
* Scala.js 0.6.24 and 1.0.0-M5
diff --git a/.travis.yml b/.travis.yml
@@ -17,12 +17,15 @@ jdk:
 env:
   - SCALAJS_VERSION=0.6.23
   - SCALAJS_VERSION=1.0.0-M3
+  - SCALAJS_VERSION=1.0.0-M5
 matrix:
   exclude:
     - scala: 2.10.7
       env: SCALAJS_VERSION=1.0.0-M3
     - scala: 2.13.0-M4
       env: SCALAJS_VERSION=1.0.0-M3
+    - scala: 2.10.7
+      env: SCALAJS_VERSION=1.0.0-M5
 
 cache:
   directories:
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,14 @@
 import sbtcrossproject.crossProject
 
-crossScalaVersions in ThisBuild := Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
+crossScalaVersions in ThisBuild := {
+  val allVersions = Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
+  if (scalaJSVersion.startsWith("0.6."))
+    allVersions
+  else if (scalaJSVersion == "1.0.0-M3")
+    allVersions.filter(v => !v.startsWith("2.10.") && v != "2.13.0-M4")
+  else
+    allVersions.filter(!_.startsWith("2.10."))
+}
 scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
 
 val commonSettings: Seq[Setting[_]] = Seq(
diff --git a/project/build.sbt b/project/build.sbt
@@ -1,7 +1,7 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.24")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")
