Merge pull request #594 from ashawley/1.14/sbt-scala-js-0.6.31

Cherry-pick update Scala.js 0.6.31

Author: ashawley

CHANGELOG.markdown

@@ -4,7 +4,9 @@
 
 ### Changed
 
-* Update Scala.js 1.0.0-RC2, previously was 1.0.0-M8
+* Update Scala.js to 1.0.0-RC2, previously was 1.0.0-M8.
+
+* Update Scala.js to 0.6.31, previously was 0.6.29.
 
 ### Fixed
 

build.sbt

@@ -25,7 +25,7 @@ lazy val scalaVersionSettings = Seq(
 )
 
 lazy val scalaJSVersion =
-  env("SCALAJS_VERSION").getOrElse("0.6.29")
+  env("SCALAJS_VERSION").getOrElse("0.6.31")
 
 lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
 

examples/scalajs/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31")

project/plugin.sbt

@@ -12,7 +12,7 @@ def printAndDie(msg: String): Nothing = {
 
 // Update SCALAJS_VERSION in release.sh, as well
 val scalaJSVersion = env("SCALAJS_VERSION") match {
-  case Some("0.6.29") | None => "0.6.29"
+  case Some("0.6.31") | None => "0.6.31"
   case Some("1.0.0-RC2") => "1.0.0-RC2"
   case Some(v) => printAndDie(s"unsupported scala.js version: $v")
 }

release.sh

@@ -53,7 +53,7 @@ runsbt "+ clean"
 runsbt "+ jvm/$CMD"
 
 # step 4b: js releases (clean versions)
-SCALAJS_VERSION="0.6.29" runsbt "+ js/$CMD"
+SCALAJS_VERSION="0.6.31" runsbt "+ js/$CMD"
 runsbt "+ js/clean"
 SCALAJS_VERSION="1.0.0-RC2" runsbt "+ js/$CMD"