Skip to content

Commit

Permalink
Release version 0.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrf committed Dec 9, 2019
1 parent 25bb8e6 commit 63c5142
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val `sbt-scalajs-bundler` =
.settings(commonSettings)
.settings(
sbtPlugin := true,
name := "sbt-scalajs-bundler",
name := (if (isScalaJS1x) "sbt-scalajs-bundler" else "sbt-scalajs-bundler-0.6"),
description := "Module bundler for Scala.js projects",
libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.7",
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion),
Expand All @@ -35,7 +35,7 @@ val `sbt-web-scalajs-bundler` =
val () = publishLocal.value
val () = (publishLocal in `sbt-scalajs-bundler`).value
},
name := "sbt-web-scalajs-bundler",
name := (if (isScalaJS1x) "sbt-web-scalajs-bundler" else "sbt-web-scalajs-bundler-0.6"),
description := "Module bundler for Scala.js projects (integration with sbt-web-scalajs)",
addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % (if (isScalaJS1x) "1.0.9" else "1.0.9-0.6"))
)
Expand Down
4 changes: 2 additions & 2 deletions manual/src/ornate/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Version 0.16.0

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

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

## Version 0.15.0

Expand Down
8 changes: 6 additions & 2 deletions manual/src/ornate/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ You need to have `npm` installed on your system.
Add the `sbt-scalajs-bundler` plugin to your Scala.js project, in your `project/plugins.sbt` file:

~~~ scala expandVars=true
// For Scala.js 1.x
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}")
// Or, for Scala.js 0.6.x
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}-0.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-0.6" % "{{version}}")
~~~

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

~~~ scala expandVars=true
// For Scala.js 1.x
addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % "{{version}}")
// Or, for Scala.js 0.6.x
addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler-0.6" % "{{version}}")
~~~

Then, enable the `WebScalaJSBundlerPlugin` on the project that uses sbt-web:
Expand Down
3 changes: 3 additions & 0 deletions manual/src/ornate/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ scalajs-bundler uses [npm](https://www.npmjs.com) and [webpack](https://webpack.
Last stable version is ![](config:version):

~~~ scala expandVars=true
// For Scala.js 1.x
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "{{version}}")
// Or, for Scala.js 0.6.x
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-0.6" % "{{version}}")
~~~

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

0 comments on commit 63c5142

Please sign in to comment.