Merge pull request #60 from sjrd/upgrades

Upgrades.

.travis.yml

@@ -5,23 +5,17 @@ script:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.6
-  - 2.13.0-M3
-  - 2.13.0-M4
+  - 2.12.8
+  - 2.13.0-RC1
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=0.6.24
-  - SCALAJS_VERSION=1.0.0-M3
-  - SCALAJS_VERSION=1.0.0-M5
+  - SCALAJS_VERSION=0.6.27
+  - SCALAJS_VERSION=1.0.0-M7
 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
+      env: SCALAJS_VERSION=1.0.0-M7
 
 cache:
   directories:

build.sbt

@@ -2,11 +2,9 @@ lazy val root = project.in(file(".")).
   enablePlugins(ScalaJSPlugin)
 
 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.8", "2.11.12", "2.10.7", "2.13.0-RC1")
   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."))
 }
@@ -25,6 +23,15 @@ libraryDependencies +=
 
 scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
 
+// Work around https://github.com/scala-js/scala-js/issues/3612
+scalacOptions in (Compile, doc) := {
+  val prev = (scalacOptions in (Compile, doc)).value
+  if (scalaJSVersion.startsWith("0.6.") && scalaVersion.value.startsWith("2.13."))
+    prev.filter(_ != "-Xfatal-warnings")
+  else
+    prev
+}
+
 homepage := Some(url("http://scala-js.org/"))
 
 licenses += ("BSD 3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))

project/build.sbt

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