Merge pull request #6 from cquiroz/upgrade_scala_2.12

Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13.

Author: sjrd

.travis.yml

@@ -4,12 +4,11 @@ script:
   - sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
   - sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
   - sbt ++$TRAVIS_SCALA_VERSION testSuite/test
-  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' testSuite/test
-  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' 'set scalaJSStage in Global := FullOptStage' testSuite/test
+  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuite/test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
 scala:
   - 2.10.6
   - 2.11.8
-  - 2.12.0-M4
+  - 2.12.0
 jdk:
   - oraclejdk8

build.sbt

@@ -1,6 +1,8 @@
 import sbt.Keys._
 import org.scalajs.sbtplugin.cross.CrossProject
 
+crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0")
+
 val commonSettings: Seq[Setting[_]] = Seq(
   version := "0.1.1-SNAPSHOT",
   organization := "org.scala-js",

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.13

project/build.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")