Merge pull request #198 from SwissBorg/bump-deps

tiagomota · web-flow · commit 7739f01c9e12 · 2021-09-30T09:40:07.000+01:00
Update dependencies
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,9 +1,10 @@
-version = 2.7.5
+version = 3.0.5
 
 style = defaultWithAlign
 
-docstrings                 = JavaDoc
-indentOperator             = spray
+docstrings.style           = Asterisk
+docstrings.wrap            = no
+indentOperator.preset      = spray
 maxColumn                  = 120
 rewrite.rules              = [RedundantParens, SortImports, AvoidInfix]
 unindentTopLevelOperators  = true
@@ -12,7 +13,8 @@ align.openParenDefnSite    = false
 align.openParenCallSite    = false
 optIn.breakChainOnFirstMethodDot = false
 optIn.configStyleArguments = false
-danglingParentheses = false
+danglingParentheses.defnSite = false
+danglingParentheses.callSite = false
 spaces.inImportCurlyBraces = true
 rewrite.neverInfix.excludeFilters = [
   and
@@ -51,3 +53,4 @@ rewriteTokens = {
   "←": "<-"
 }
 newlines.afterCurlyLambda = preserve
+newlines.implicitParamListModifierPrefer = before
diff --git a/core/src/main/scala/akka/persistence/postgres/db/DbErrors.scala b/core/src/main/scala/akka/persistence/postgres/db/DbErrors.scala
@@ -28,8 +28,8 @@ object DbErrors {
         DBIO.successful(())
     }
 
-  def withHandledIndexErrors(logger: Logger, indexDetails: String)(dbio: DBIOAction[_, NoStream, Effect])(implicit
-      ec: ExecutionContext): DBIOAction[Unit, NoStream, Effect] =
+  def withHandledIndexErrors(logger: Logger, indexDetails: String)(dbio: DBIOAction[_, NoStream, Effect])(
+      implicit ec: ExecutionContext): DBIOAction[Unit, NoStream, Effect] =
     dbio.asTry.flatMap {
       case Failure(ex: SQLException) if ex.getSQLState == PgUniqueViolation =>
         logger.debug(s"Index $indexDetails already exists")
diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/ByteArrayJournalSerializer.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/ByteArrayJournalSerializer.scala
@@ -17,8 +17,8 @@ import scala.collection.immutable._
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.Try
 
-class ByteArrayJournalSerializer(serialization: Serialization, tagConverter: TagIdResolver)(implicit
-    val executionContext: ExecutionContext)
+class ByteArrayJournalSerializer(serialization: Serialization, tagConverter: TagIdResolver)(
+    implicit val executionContext: ExecutionContext)
     extends FlowPersistentReprSerializer[JournalRow] {
 
   override def serialize(persistentRepr: PersistentRepr, tags: Set[String]): Future[JournalRow] = {
diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/FlatJournalDao.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/FlatJournalDao.scala
@@ -9,8 +9,8 @@ import slick.jdbc.JdbcBackend._
 
 import scala.concurrent.ExecutionContext
 
-class FlatJournalDao(val db: Database, val journalConfig: JournalConfig, serialization: Serialization)(implicit
-    val ec: ExecutionContext,
+class FlatJournalDao(val db: Database, val journalConfig: JournalConfig, serialization: Serialization)(
+    implicit val ec: ExecutionContext,
     val mat: Materializer)
     extends BaseByteArrayJournalDao {
   val queries = new JournalQueries(FlatJournalTable(journalConfig.journalTableConfiguration))
diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/NestedPartitionsJournalDao.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/NestedPartitionsJournalDao.scala
@@ -13,8 +13,8 @@ import slick.jdbc.JdbcBackend.Database
 import scala.collection.immutable.{ List, Nil, Seq }
 import scala.concurrent.{ ExecutionContext, Future }
 
-class NestedPartitionsJournalDao(db: Database, journalConfig: JournalConfig, serialization: Serialization)(implicit
-    ec: ExecutionContext,
+class NestedPartitionsJournalDao(db: Database, journalConfig: JournalConfig, serialization: Serialization)(
+    implicit ec: ExecutionContext,
     mat: Materializer)
     extends FlatJournalDao(db, journalConfig, serialization) {
   override val queries = new JournalQueries(NestedPartitionsJournalTable(journalConfig.journalTableConfiguration))
diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/PartitionedJournalDao.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/PartitionedJournalDao.scala
@@ -12,8 +12,8 @@ import slick.jdbc.JdbcBackend.Database
 import scala.collection.immutable.{ Nil, Seq }
 import scala.concurrent.{ ExecutionContext, Future }
 
-class PartitionedJournalDao(db: Database, journalConfig: JournalConfig, serialization: Serialization)(implicit
-    ec: ExecutionContext,
+class PartitionedJournalDao(db: Database, journalConfig: JournalConfig, serialization: Serialization)(
+    implicit ec: ExecutionContext,
     mat: Materializer)
     extends FlatJournalDao(db, journalConfig, serialization) {
   override val queries = new JournalQueries(PartitionedJournalTable(journalConfig.journalTableConfiguration))
diff --git a/core/src/main/scala/akka/persistence/postgres/query/JournalSequenceActor.scala b/core/src/main/scala/akka/persistence/postgres/query/JournalSequenceActor.scala
@@ -17,8 +17,8 @@ import scala.collection.immutable.NumericRange
 import scala.concurrent.duration.FiniteDuration
 
 object JournalSequenceActor {
-  def props(readJournalDao: ReadJournalDao, config: JournalSequenceRetrievalConfig)(implicit
-      materializer: Materializer): Props = Props(new JournalSequenceActor(readJournalDao, config))
+  def props(readJournalDao: ReadJournalDao, config: JournalSequenceRetrievalConfig)(
+      implicit materializer: Materializer): Props = Props(new JournalSequenceActor(readJournalDao, config))
 
   private case object QueryOrderingIds
   private case class NewOrderingIds(originalOffset: Long, elements: Seq[OrderingId])
@@ -56,8 +56,8 @@ object JournalSequenceActor {
  * This is required to guarantee the EventByTag does not skip any rows in case rows with a higher (ordering) id are
  * visible in the database before rows with a lower (ordering) id.
  */
-class JournalSequenceActor(readJournalDao: ReadJournalDao, config: JournalSequenceRetrievalConfig)(implicit
-    materializer: Materializer)
+class JournalSequenceActor(readJournalDao: ReadJournalDao, config: JournalSequenceRetrievalConfig)(
+    implicit materializer: Materializer)
     extends Actor
     with ActorLogging
     with Timers {
diff --git a/core/src/main/scala/akka/persistence/postgres/snapshot/dao/ByteArraySnapshotDao.scala b/core/src/main/scala/akka/persistence/postgres/snapshot/dao/ByteArraySnapshotDao.scala
@@ -17,8 +17,7 @@ import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.{ Failure, Success }
 
 class ByteArraySnapshotDao(db: JdbcBackend#Database, snapshotConfig: SnapshotConfig, serialization: Serialization)(
-    implicit
-    ec: ExecutionContext,
+    implicit ec: ExecutionContext,
     val mat: Materializer)
     extends SnapshotDao {
   import akka.persistence.postgres.db.ExtendedPostgresProfile.api._
diff --git a/core/src/test/scala/akka/persistence/postgres/query/JournalSequenceActorTest.scala b/core/src/test/scala/akka/persistence/postgres/query/JournalSequenceActorTest.scala
@@ -171,8 +171,8 @@ abstract class JournalSequenceActorTest(val schemaType: SchemaType) extends Quer
    *                 (since the actor queries every second by default,
    *                 this is effectively the number of seconds after which events are assumed missing)
    */
-  def withJournalSequenceActor(db: JdbcBackend.Database, maxTries: Int)(f: ActorRef => Unit)(implicit
-      system: ActorSystem): Unit = {
+  def withJournalSequenceActor(db: JdbcBackend.Database, maxTries: Int)(f: ActorRef => Unit)(
+      implicit system: ActorSystem): Unit = {
     import system.dispatcher
     implicit val mat: Materializer = SystemMaterializer(system).materializer
     val readJournalDao =
diff --git a/core/src/test/scala/akka/persistence/postgres/query/QueryTestSpec.scala b/core/src/test/scala/akka/persistence/postgres/query/QueryTestSpec.scala
@@ -44,8 +44,8 @@ trait ReadJournalOperations {
   def countJournal: Future[Long]
 }
 
-class ScalaPostgresReadJournalOperations(readJournal: PostgresReadJournal)(implicit
-    system: ActorSystem,
+class ScalaPostgresReadJournalOperations(readJournal: PostgresReadJournal)(
+    implicit system: ActorSystem,
     mat: Materializer)
     extends ReadJournalOperations {
   def this(system: ActorSystem) =
@@ -106,8 +106,8 @@ class ScalaPostgresReadJournalOperations(readJournal: PostgresReadJournal)(impli
       .map(_.sum)
 }
 
-class JavaDslPostgresReadJournalOperations(readJournal: javadsl.PostgresReadJournal)(implicit
-    system: ActorSystem,
+class JavaDslPostgresReadJournalOperations(readJournal: javadsl.PostgresReadJournal)(
+    implicit system: ActorSystem,
     mat: Materializer)
     extends ReadJournalOperations {
   def this(system: ActorSystem) =
@@ -300,15 +300,15 @@ abstract class QueryTestSpec(config: String, configOverrides: Map[String, Config
     system.actorOf(Props(new TestActor(persistenceId, replyToMessages)))
   }
 
-  def withTestActors(seq: Int = 1, replyToMessages: Boolean = false)(f: (ActorRef, ActorRef, ActorRef) => Unit)(implicit
-      system: ActorSystem): Unit = {
+  def withTestActors(seq: Int = 1, replyToMessages: Boolean = false)(f: (ActorRef, ActorRef, ActorRef) => Unit)(
+      implicit system: ActorSystem): Unit = {
     val refs = (seq until seq + 3).map(setupEmpty(_, replyToMessages)).toList
     try f(refs.head, refs.drop(1).head, refs.drop(2).head)
     finally killActors(refs: _*)
   }
 
-  def withManyTestActors(amount: Int, seq: Int = 1, replyToMessages: Boolean = false)(f: Seq[ActorRef] => Unit)(implicit
-      system: ActorSystem): Unit = {
+  def withManyTestActors(amount: Int, seq: Int = 1, replyToMessages: Boolean = false)(f: Seq[ActorRef] => Unit)(
+      implicit system: ActorSystem): Unit = {
     val refs = (seq until seq + amount).map(setupEmpty(_, replyToMessages)).toList
     try f(refs)
     finally killActors(refs: _*)
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -8,29 +8,26 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.8.7"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
+gem "minima", "~> 2.5.1"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
+gem "github-pages", group: :jekyll_plugins
+gem "just-the-docs"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.9"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 # and associated library.
 install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
-  gem "tzinfo", "~> 1.2"
+  gem "tzinfo", "~> 1.2.7"
   gem "tzinfo-data"
 end
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
-
-gem "github-pages", "~> 206", group: :jekyll_plugins
-gem "just-the-docs"
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
diff --git a/migration/src/main/scala/akka/persistence/postgres/migration/journal/Jdbc4JournalMigration.scala b/migration/src/main/scala/akka/persistence/postgres/migration/journal/Jdbc4JournalMigration.scala
diff --git a/migration/src/main/scala/akka/persistence/postgres/migration/snapshot/Jdbc4SnapshotStoreMigration.scala b/migration/src/main/scala/akka/persistence/postgres/migration/snapshot/Jdbc4SnapshotStoreMigration.scala
diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala
