Merge pull request #19 from sjrd/upgrades

Upgrades.

Author: sjrd

.travis.yml

@@ -7,15 +7,16 @@ script:
   - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuiteJS/test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
 scala:
-  - 2.10.6
-  - 2.11.11
-  - 2.12.2
-  - 2.13.0-M1
+  - 2.10.7
+  - 2.11.12
+  - 2.12.4
+  - 2.13.0-M2
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=0.6.18
+  - SCALAJS_VERSION=0.6.21
   - SCALAJS_VERSION=1.0.0-M1
+  - SCALAJS_VERSION=1.0.0-M2
 
 cache:
   directories:

build.sbt

@@ -1,4 +1,6 @@
-crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
+import sbtcrossproject.crossProject
+
+crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.12", "2.10.7", "2.13.0-M2")
 scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
 
 val commonSettings: Seq[Setting[_]] = Seq(
@@ -56,7 +58,7 @@ lazy val root: Project = project.in(file(".")).
     pomIncludeRepository := { _ => false }
   )
 
-lazy val testSuite = crossProject.
+lazy val testSuite = crossProject(JSPlatform, JVMPlatform).
   jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).
   settings(commonSettings: _*).
   settings(

project/build.properties

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

project/build.sbt

@@ -1,6 +1,13 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
+{
+  if (scalaJSVersion != "1.0.0-M1")
+    addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.0")
+  else
+    Nil
+}
+
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")