Merge pull request #375 from cquiroz/scalajs-1.0.0-M2

Updated scala.js versions

Author: rickynils

.travis.yml

@@ -29,7 +29,7 @@ env:
     - PLATFORM=jvm SBT_PARALLEL=true  WORKERS=4 DEPLOY=false
     - PLATFORM=jvm SBT_PARALLEL=false WORKERS=4 DEPLOY=false
     - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true
-    - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M1
+    - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M2
 sudo: false
 
 matrix:

project/build.properties

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

project/plugin.sbt

@@ -3,7 +3,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.14")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.19")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.21")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)