Skip to content

Cherry-pick update Scala.js 0.6.31 #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2019
Merged

Cherry-pick update Scala.js 0.6.31 #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcbcda5
Update sbt-scalajs, scalajs-compiler, ... to 0.6.31
scala-steward Nov 21, 2019
9aeb21f
update Scala.js version in more places
SethTisue Nov 21, 2019
b1582c7
Mention Scala.js 0.6.31 in changelog
ashawley Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(

Expand Down
2 changes: 1 addition & 1 deletion examples/scalajs/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31")
2 changes: 1 addition & 1 deletion project/plugin.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down