Merge pull request scala-js#318 from sjrd/upgrades

Upgrades

Author: sjrd

.travis.yml

@@ -8,13 +8,16 @@ scala:
  - 2.10.7
  - 2.11.12
  - 2.12.4
- - 2.13.0-M2
+ - 2.13.0-M3
 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:

build.sbt

@@ -5,7 +5,10 @@ lazy val root = project.in(file(".")).
 
 name := "Scala.js DOM"
 
-crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2")
+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")
+}
 scalaVersion in ThisBuild := crossScalaVersions.value.head
 
 val commonSettings = Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.17

project/build.sbt

@@ -1,5 +1,5 @@
 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)