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

Upgrades.

Author: sjrd

.travis.yml

@@ -9,23 +9,20 @@ script:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.6
-  - 2.13.0-M3
-  - 2.13.0-M4
+  - 2.12.10
+  - 2.13.1
 jdk:
-  - oraclejdk8
+  - openjdk8
 env:
-  - SCALAJS_VERSION=0.6.23
-  - SCALAJS_VERSION=1.0.0-M3
-  - SCALAJS_VERSION=1.0.0-M5
+  - SCALAJS_VERSION=0.6.31
+  - SCALAJS_VERSION=1.0.0-M8
+  - SCALAJS_VERSION=1.0.0-RC1
 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
+      env: SCALAJS_VERSION=1.0.0-M8
     - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-M5
+      env: SCALAJS_VERSION=1.0.0-RC1
 
 cache:
   directories:

build.sbt

@@ -1,11 +1,9 @@
 import sbtcrossproject.crossProject
 
 crossScalaVersions in ThisBuild := {
-  val allVersions = Seq("2.12.6", "2.11.12", "2.10.7", "2.13.0-M3", "2.13.0-M4")
+  val allVersions = Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
   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."))
 }
@@ -82,6 +80,3 @@ lazy val testSuite = crossProject(JSPlatform, JVMPlatform).
     libraryDependencies +=
       "com.novocode" % "junit-interface" % "0.9" % "test"
   )
-
-lazy val testSuiteJS = testSuite.js
-lazy val testSuiteJVM = testSuite.jvm

project/build.properties

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

project/build.sbt

@@ -1,7 +1,7 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.24")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
 
-addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")
+addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")