diff --git a/.spelling b/.spelling index ced4d57da..312a6a823 100644 --- a/.spelling +++ b/.spelling @@ -82,6 +82,7 @@ Netcat Netty OOM PEM +Pekko Play2-ReactiveMongo QueryBuilderFactory.this.pack.Reader ReactiveMongo @@ -216,6 +217,7 @@ NettyPack 2.5.x 2.6.x 4.1.x +1.0.x. # Jekyll workaround index.html diff --git a/_config.yml b/_config.yml index 3c429a475..cf83641dd 100644 --- a/_config.yml +++ b/_config.yml @@ -7,7 +7,7 @@ kramdown: input: GFM syntax_highlighter: rouge latest_major_release: 1.0 -latest_release: 1.1.0-RC11 +latest_release: 1.1.0-RC12 exclude: [vendor,target] plugins: - jekyll-sitemap @@ -22,7 +22,7 @@ _0_1x_latest_minor: 0.20.13 _0_1x_scala_major: 2.12 _1_0_latest_major: 1.1 -_1_0_latest_minor: 1.1.0-RC11 +_1_0_latest_minor: 1.1.0-RC12 _1_0_scala_major: 2.13 algolia: diff --git a/build.sbt b/build.sbt index 00980f05c..31e85ed51 100644 --- a/build.sbt +++ b/build.sbt @@ -13,11 +13,10 @@ lazy val `reactivemongo-site` = (project in file(".")) scalaVersion := "2.11.12", ThisBuild / scalacOptions ++= Seq("-Ywarn-unused-import", "-unchecked"), libraryDependencies ++= Seq( - "org.reactivemongo" %% "reactivemongo" % "1.1.0-RC11"), - ThisBuild / resolvers ++= Seq( - Resolver.typesafeRepo("releases"), - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("staging"))) + "org.reactivemongo" %% "reactivemongo" % "1.1.0-RC12"), + ThisBuild / resolvers ++= ( + Resolver.typesafeRepo("releases") +: ( + Resolver.sonatypeOssRepos("snapshots") ++ Resolver.sonatypeOssRepos("staging")))) .aggregate(release_0_1x, release_1_0) organization := "org.reactivemongo" diff --git a/project/build.properties b/project/build.properties index 46e43a97e..e8a1e246e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.7 diff --git a/releases/1.0/build.sbt b/releases/1.0/build.sbt index 8f92facef..74df6fd2d 100644 --- a/releases/1.0/build.sbt +++ b/releases/1.0/build.sbt @@ -2,9 +2,9 @@ organization := "org.reactivemongo" name := "release_1_0" -version := "1.1.0-RC11" +version := "1.1.0-RC12" -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" libraryDependencies ++= Seq( "reactivemongo-akkastream", @@ -20,8 +20,8 @@ libraryDependencies ++= Seq( libraryDependencies ++= { val idx = version.value.lastIndexOf('-') val playVer = version.value.splitAt(idx) match { - case ("", major) => s"${major}-play27" - case (major, mod) => s"${major}-play27${mod}" + case ("", major) => s"${major}.play27" + case (major, mod) => s"${major}.play27${mod}" } Seq("play2-reactivemongo", "reactivemongo-play-json-compat").map( diff --git a/releases/1.0/documentation/json/overview.md b/releases/1.0/documentation/json/overview.md index d785be7b0..b99337971 100644 --- a/releases/1.0/documentation/json/overview.md +++ b/releases/1.0/documentation/json/overview.md @@ -12,7 +12,7 @@ You can setup the Play JSON compatibility for ReactiveMongo by adding the follow ```ocaml libraryDependencies ++= Seq( - "org.reactivemongo" %% "reactivemongo-play-json-compat" % "{{site._1_0_latest_minor}}-play29" // For Play 2.9.x (ajust accordingly) + "org.reactivemongo" %% "reactivemongo-play-json-compat" % "{{site._1_0_latest_minor}}.play29" // For Play 2.9.x (ajust accordingly) ) ``` @@ -41,7 +41,7 @@ import reactivemongo.play.json.compat._ def foo(v: BSONValue): JsValue = v // ValueConverters.fromValue ``` -**API documentations:** [ReactiveMongo Play JSON API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/reactivemongo-play-json_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play28/reactivemongo-play-json_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play29-javadoc.jar/!/index.html) +**API documentations:** [ReactiveMongo Play JSON API](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/reactivemongo-play-json_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play28/reactivemongo-play-json_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play29-javadoc.jar/!/index.html) > If you want to use this JSON serialization outside of Play application, the dependency to the standalone Play JSON library must then be added: `"com.typesafe.play" %% "play-json" % version`. diff --git a/releases/1.0/documentation/tutorial/play.md b/releases/1.0/documentation/tutorial/play.md index eff4a71aa..f5f95bfc6 100644 --- a/releases/1.0/documentation/tutorial/play.md +++ b/releases/1.0/documentation/tutorial/play.md @@ -13,24 +13,29 @@ This module is based on the [Play JSON serialization](../json/overview.html). The latest version of this plugin is for Play 2.5+, and can be enabled by adding the following dependency in your `project/Build.scala` (or `build.sbt`). ```ocaml +// only for Play 2.9.x (Scala 2.13+) +libraryDependencies ++= Seq( + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}.play29" +) + // only for Play 2.8.x (Scala 2.12) libraryDependencies ++= Seq( - "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}-play28" + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}.play28" ) // only for Play 2.7.x (Scala 2.12) libraryDependencies ++= Seq( - "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}-play27" + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}.play27" ) // only for Play 2.6.x (Scala 2.12) libraryDependencies ++= Seq( - "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}-play26" + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}.play26" ) // only for Play 2.5.x (Scala 2.11) libraryDependencies ++= Seq( - "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}-play25" + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_minor}}.play25" ) ``` @@ -40,9 +45,9 @@ libraryDependencies ++= Seq( As for Play itself, this ReactiveMongo plugin requires a JVM 1.8+. -The [API of this Play module](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play26-javadoc.jar/!/index.html) can be browsed online. +The [API of this Play module](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play26-javadoc.jar/!/index.html) can be browsed online. -The API for the standalone JSON serialization is [also available](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/reactivemongo-play-json_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play26/reactivemongo-play-json_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play26-javadoc.jar/!/index.html). +The API for the standalone JSON serialization is [also available](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/reactivemongo-play-json_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play26/reactivemongo-play-json_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play26-javadoc.jar/!/index.html). If you want to use the latest snapshot, add the following instead (only for play > 2.4): @@ -50,7 +55,7 @@ If you want to use the latest snapshot, add the following instead (only for play resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" libraryDependencies ++= Seq( - "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_snapshot}}-play28" + "org.reactivemongo" %% "play2-reactivemongo" % "{{site._1_0_latest_snapshot}}.play28" ) ``` @@ -60,7 +65,7 @@ libraryDependencies ++= Seq( **`ReactiveMongoPlugin` is deprecated, long live to `ReactiveMongoModule` and `ReactiveMongoApi`**. -Play has deprecated the plugins in version 2.4, therefore it is recommended to remove the former `ReactiveMongoPlugin` from your project. It must be replaced it by `ReactiveMongoModule` and [`ReactiveMongoApi`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoApi) which is the interface to MongoDB. +Play has deprecated the plugins in version 2.4, therefore it is recommended to remove the former `ReactiveMongoPlugin` from your project. It must be replaced it by `ReactiveMongoModule` and [`ReactiveMongoApi`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoApi) which is the interface to MongoDB. Thus, the dependency injection can be configured, so that the your controllers are given the new ReactiveMongo API. First, Add the line bellow to `application.conf`: @@ -87,7 +92,7 @@ class MyController @Inject() ( } ``` -The traits [`ReactiveMongoComponents`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoComponents) and [`ReactiveMongoApiComponents`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}-play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}-play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoApiComponents) can be used for [compile-time dependency injection](https://playframework.com/documentation/latest/ScalaCompileTimeDependencyInjection). +The traits [`ReactiveMongoComponents`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoComponents) and [`ReactiveMongoApiComponents`](https://oss.sonatype.org/service/local/repositories/releases/archive/org/reactivemongo/play2-reactivemongo_{{site._1_0_scala_major}}/{{site._1_0_latest_minor}}.play26/play2-reactivemongo_{{site._1_0_scala_major}}-{{site._1_0_latest_minor}}.play26-javadoc.jar/!/index.html#play.modules.reactivemongo.ReactiveMongoApiComponents) can be used for [compile-time dependency injection](https://playframework.com/documentation/latest/ScalaCompileTimeDependencyInjection). ```scala import javax.inject.Inject