Skip to content

Commit 63c5142

Browse files
committed
Release version 0.16.0
1 parent 25bb8e6 commit 63c5142

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val `sbt-scalajs-bundler` =
1212
.settings(commonSettings)
1313
.settings(
1414
sbtPlugin := true,
15-
name := "sbt-scalajs-bundler",
15+
name := (if (isScalaJS1x) "sbt-scalajs-bundler" else "sbt-scalajs-bundler-0.6"),
1616
description := "Module bundler for Scala.js projects",
1717
libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.7",
1818
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion),
@@ -35,7 +35,7 @@ val `sbt-web-scalajs-bundler` =
3535
val () = publishLocal.value
3636
val () = (publishLocal in `sbt-scalajs-bundler`).value
3737
},
38-
name := "sbt-web-scalajs-bundler",
38+
name := (if (isScalaJS1x) "sbt-web-scalajs-bundler" else "sbt-web-scalajs-bundler-0.6"),
3939
description := "Module bundler for Scala.js projects (integration with sbt-web-scalajs)",
4040
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % (if (isScalaJS1x) "1.0.9" else "1.0.9-0.6"))
4141
)

manual/src/ornate/changelog.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Version 0.16.0
44

5-
> Unreleased
5+
> 2019 Dec 09
66
77
The main highlight of this release is the support of Scala.js 1.0.0-RC1 instead of 1.0.0-M7.
88
We still support Scala.js 0.6.x, but we require at least version 0.6.31.
@@ -12,7 +12,7 @@ We still support Scala.js 0.6.x, but we require at least version 0.6.31.
1212
- Require sbt 1.2.1 or later in the sbt 1.x branch (sbt 0.13.17+ is still supported)
1313

1414
You can find the complete list of commits since the last release
15-
[here](https://github.com/scalacenter/scalajs-bundler/compare/v0.15.0...master).
15+
[here](https://github.com/scalacenter/scalajs-bundler/compare/v0.15.0...v0.16.0).
1616

1717
## Version 0.15.0
1818

manual/src/ornate/getting-started.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ You need to have `npm` installed on your system.
77
Add the `sbt-scalajs-bundler` plugin to your Scala.js project, in your `project/plugins.sbt` file:
88

99
~~~ scala expandVars=true
10+
// For Scala.js 1.x
1011
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}")
1112
// Or, for Scala.js 0.6.x
12-
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}-0.6")
13+
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-0.6" % "{{version}}")
1314
~~~
1415

1516
> {.note}
16-
> The plugin requires Scala.js 0.6.26+ or 1.0.0-M7 and either
17+
> The plugin requires Scala.js 0.6.26+ or 1.0.0-RC1 and either
1718
> sbt 0.13.17+ or 1.2.1+.
1819
1920
Enable the `ScalaJSBundlerPlugin`, in your `build.sbt` file:
@@ -53,7 +54,10 @@ See complete examples in the [tests](https://github.com/scalacenter/scalajs-bund
5354
For sbt-web integration use the `sbt-web-scalajs-bundler` plugin instead of `sbt-scalajs-bundler`:
5455

5556
~~~ scala expandVars=true
57+
// For Scala.js 1.x
5658
addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % "{{version}}")
59+
// Or, for Scala.js 0.6.x
60+
addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler-0.6" % "{{version}}")
5761
~~~
5862

5963
Then, enable the `WebScalaJSBundlerPlugin` on the project that uses sbt-web:

manual/src/ornate/index.md

+3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ scalajs-bundler uses [npm](https://www.npmjs.com) and [webpack](https://webpack.
88
Last stable version is ![](config:version):
99

1010
~~~ scala expandVars=true
11+
// For Scala.js 1.x
1112
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}")
13+
// Or, for Scala.js 0.6.x
14+
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-0.6" % "{{version}}")
1215
~~~
1316

1417
See the [**getting started**](getting-started.md) page for more details about

0 commit comments

Comments
 (0)