diff --git a/build.sbt b/build.sbt index 6428dbc8..a44a9f38 100644 --- a/build.sbt +++ b/build.sbt @@ -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), @@ -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")) ) diff --git a/manual/src/ornate/changelog.md b/manual/src/ornate/changelog.md index 149a4353..90b2a029 100644 --- a/manual/src/ornate/changelog.md +++ b/manual/src/ornate/changelog.md @@ -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. @@ -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 diff --git a/manual/src/ornate/getting-started.md b/manual/src/ornate/getting-started.md index 1954d0fb..3095b2d9 100644 --- a/manual/src/ornate/getting-started.md +++ b/manual/src/ornate/getting-started.md @@ -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: @@ -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: diff --git a/manual/src/ornate/index.md b/manual/src/ornate/index.md index d5b8827d..ec62333d 100644 --- a/manual/src/ornate/index.md +++ b/manual/src/ornate/index.md @@ -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