Merge pull request #58 from sjrd/upgrades

Upgrades.

.travis.yml

@@ -5,17 +5,23 @@ script:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.4
+  - 2.12.6
   - 2.13.0-M3
+  - 2.13.0-M4
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=0.6.22
+  - SCALAJS_VERSION=0.6.24
   - 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:

build.sbt

@@ -2,8 +2,13 @@ lazy val root = project.in(file(".")).
   enablePlugins(ScalaJSPlugin)
 
 crossScalaVersions in ThisBuild := {
-  if (scalaJSVersion.startsWith("1.")) Seq("2.12.4", "2.11.12", "2.13.0-M3")
-  else Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M3")
+  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
 
@@ -16,7 +21,7 @@ version := "0.9.4-SNAPSHOT"
 organization := "be.doeraene"
 
 libraryDependencies +=
-  "org.scala-js" %%% "scalajs-dom" % "0.9.5"
+  "org.scala-js" %%% "scalajs-dom" % "0.9.6"
 
 scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
 

project/build.sbt

@@ -1,4 +1,4 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.22")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.24")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)