Merge pull request #6 from sjrd/upgrades

Upgrades.

Author: sjrd

.travis.yml

@@ -1,19 +1,15 @@
 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:
   - 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

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/")),

project/build.properties

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

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"