Merge pull request #64 from sjrd/upgrades

Upgrades.

.travis.yml

@@ -5,17 +5,17 @@ script:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.8
-  - 2.13.0-RC2
+  - 2.12.10
+  - 2.13.1
 jdk:
   - openjdk8
 env:
-  - SCALAJS_VERSION=0.6.27
-  - SCALAJS_VERSION=1.0.0-M7
+  - SCALAJS_VERSION=0.6.31
+  - SCALAJS_VERSION=1.0.0-RC2
 matrix:
   exclude:
     - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-M7
+      env: SCALAJS_VERSION=1.0.0-RC2
 
 cache:
   directories:

build.sbt

@@ -2,7 +2,7 @@ lazy val root = project.in(file(".")).
   enablePlugins(ScalaJSPlugin)
 
 crossScalaVersions in ThisBuild := {
-  val allVersions = Seq("2.12.8", "2.11.12", "2.10.7", "2.13.0-RC2")
+  val allVersions = Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
   if (scalaJSVersion.startsWith("0.6."))
     allVersions
   else
@@ -19,19 +19,10 @@ version := "0.9.6-SNAPSHOT"
 organization := "be.doeraene"
 
 libraryDependencies +=
-  "org.scala-js" %%% "scalajs-dom" % "0.9.7"
+  "org.scala-js" %%% "scalajs-dom" % "0.9.8"
 
 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.properties

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

project/build.sbt

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