From 8475c3801165ed162748c24640935feea1fe2c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Tue, 28 Nov 2017 22:46:09 +0100
Subject: [PATCH 1/2] Remove coursier.

Now that we use published versions of Scala.js, it is not
necessary anymore, and it was causing some issues.
---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 660f70b..cc9ea6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,6 @@ env:
   - JSDOM_VERSION=9.12.0
   - JSDOM_VERSION=10.0.0
 install:
-  # The default ivy resolution takes way too much time, and times out Travis builds.
-  # We use coursier instead.
-  - mkdir -p $HOME/.sbt/0.13/plugins/
-  - echo 'addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC3")' > $HOME/.sbt/0.13/plugins/coursier.sbt
   # We need a recent version of Node.js for jsdom
   - nvm install 6
   - nvm use 6
@@ -31,4 +27,3 @@ cache:
 before_cache:
   - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
   - find $HOME/.sbt -name "*.lock" -print -delete
-  - rm $HOME/.sbt/0.13/plugins/coursier.sbt

From b54df5abff6099ef796be2fd51790dc7005e8e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Tue, 28 Nov 2017 22:30:15 +0100
Subject: [PATCH 2/2] Upgrades.

* sbt 0.13.16
* Scala 2.10.7, 2.11.12 and 2.12.4
* Scala.js 1.0.0-M2
---
 .travis.yml              | 6 +++---
 build.sbt                | 4 ++--
 project/build.properties | 2 +-
 project/plugins.sbt      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc9ea6c..b9ed50d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 sudo: false
 language: scala
 scala:
-  - 2.10.6
-  - 2.11.11
-  - 2.12.2
+  - 2.10.7
+  - 2.11.12
+  - 2.12.4
 jdk:
   - oraclejdk8
 env:
diff --git a/build.sbt b/build.sbt
index 6ea92d5..01bb3a3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,8 +2,8 @@ inThisBuild(Seq(
   version := "1.0.0-SNAPSHOT",
   organization := "org.scala-js",
 
-  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"),
-  scalaVersion := "2.11.11",
+  crossScalaVersions := Seq("2.12.4", "2.10.7", "2.11.12"),
+  scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
   homepage := Some(url("https://www.scala-js.org/")),
diff --git a/project/build.properties b/project/build.properties
index 64317fd..c091b86 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 422fd41..5417052 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")
 
-libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M1"
+libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M2"
 
 unmanagedSourceDirectories in Compile +=
   baseDirectory.value.getParentFile / "jsdom-nodejs-env/src/main/scala"