Merge branch 'master' into update/scaffeine-5.1.2

Author: tiagomota

docs/index.md

@@ -31,6 +31,9 @@ For a maven project add:
 ```
 to your `pom.xml`.
 
+> :warning: Since Akka [does not allow mixed versions](https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed) in a project, Akka dependencies are marked a `Provided`. This means that your application `libraryDependencies` needs to directly include Akka as a dependency. The minimal supported Akka version is 2.6.16.  
+
+
 ## Source code
 
 Source code for this plugin can be found on [GitHub](https://github.com/SwissBorg/akka-persistence-postgres).

project/Dependencies.scala

@@ -4,15 +4,14 @@ object Dependencies {
   val Scala213 = "2.13.7"
   val ScalaVersions = Seq(Scala213)
 
-  val AkkaVersion = "2.6.18"
-  val AkkaBinaryVersion = "2.6"
-  val FlywayVersion = "8.2.3"
+  val AkkaVersion = "2.6.16"
+  val FlywayVersion = "8.3.0"
   val ScaffeineVersion = "5.1.2"
   val ScalaTestVersion = "3.2.10"
   val SlickVersion = "3.3.3"
   val SlickPgVersion = "0.20.2"
 
-  val LogbackVersion = "1.2.9"
+  val LogbackVersion = "1.2.10"
 
   val JdbcDrivers = Seq("org.postgresql" % "postgresql" % "42.3.1")
 
@@ -25,16 +24,17 @@ object Dependencies {
     "com.typesafe.akka" %% "akka-persistence-tck" % AkkaVersion % Test,
     "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test,
     "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % Test,
-    "com.typesafe.akka" %% "akka-persistence-query" % AkkaVersion,
+    "com.typesafe.akka" %% "akka-persistence-query" % AkkaVersion % Provided,
     "com.typesafe.slick" %% "slick" % SlickVersion,
     "com.typesafe.slick" %% "slick-hikaricp" % SlickVersion,
     "org.scalatest" %% "scalatest" % ScalaTestVersion % Test) ++ JdbcDrivers.map(_ % Test)
 
-  val Migration: Seq[ModuleID] = (Seq(
-    "org.scalatest" %% "scalatest" % ScalaTestVersion,
-    "com.typesafe.akka" %% "akka-testkit" % AkkaVersion,
-    "ch.qos.logback" % "logback-classic" % LogbackVersion,
-    "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
-    "com.typesafe.akka" %% "akka-serialization-jackson" % AkkaVersion,
-    "org.flywaydb" % "flyway-core" % FlywayVersion) ++ JdbcDrivers).map(_ % Test)
+  val Migration: Seq[ModuleID] =
+    Seq("com.typesafe.akka" %% "akka-persistence-query" % AkkaVersion).map(_ % Compile) ++ (Seq(
+      "org.scalatest" %% "scalatest" % ScalaTestVersion,
+      "com.typesafe.akka" %% "akka-testkit" % AkkaVersion,
+      "ch.qos.logback" % "logback-classic" % LogbackVersion,
+      "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
+      "com.typesafe.akka" %% "akka-serialization-jackson" % AkkaVersion,
+      "org.flywaydb" % "flyway-core" % FlywayVersion) ++ JdbcDrivers).map(_ % Test)
 }

project/build.properties

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-sbt.version=1.5.8
+sbt.version=1.6.1

project/plugins.sbt

@@ -1,5 +1,5 @@
 // compliance
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")
 // release
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")