Merge pull request #59 from SwissBorg/update/pekko

Update to Pekko to 1.1.0

Author: tiagomota

README.md

@@ -20,15 +20,15 @@ You can read more about DAOs and schema variants in [the official documentation]
 To use `pekko-persistence-postgres` in your SBT project, add the following to your `build.sbt`:
 
 ```scala
-libraryDependencies += "com.swissborg" %% "pekko-persistence-postgres" % "0.7.0"
+libraryDependencies += "com.swissborg" %% "pekko-persistence-postgres" % "0.8.0-RC1"
 ```
 
 For a maven project add:
 ```xml
 <dependency>
     <groupId>com.swissborg</groupId>
     <artifactId>pekko-persistence-postgres_2.13</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0-RC1</version>
 </dependency>
 ```
 to your `pom.xml`.

build.sbt

@@ -13,12 +13,7 @@ lazy val core = project
   .settings(
     name := "pekko-persistence-postgres",
     mimaBinaryIssueFilters ++= Seq(),
-    libraryDependencies ++= {
-      (CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((3, _)) => Dependencies.Libraries.scala3
-        case _            => Dependencies.Libraries.scala2
-      })
-    } ++ Dependencies.Libraries.testing
+    libraryDependencies ++= Dependencies.Libraries.core ++ Dependencies.Libraries.testing
   )
 
 TaskKey[Unit]("verifyCodeFmt") := {
@@ -32,4 +27,4 @@ TaskKey[Unit]("verifyCodeFmt") := {
       "Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code"
     )
   }
-}
+}

core/src/main/scala-2.13/org/apache/pekko/persistence/postgres/db/ExtendedPostgresProfile.scala

@@ -87,7 +87,7 @@ class PostgresReadJournal(config: Config, configPath: String)(implicit val syste
     s"$configPath.pekko-persistence-postgres-journal-sequence-actor"
   )
   private val delaySource =
-    Source.tick(readJournalConfig.refreshInterval, 0.seconds, 0).take(1)
+    Source.tick(readJournalConfig.refreshInterval, readJournalConfig.refreshInterval, 0).take(1)
 
   /** Same type of query as `persistenceIds` but the event stream is completed immediately when it reaches the end of
     * the "result set". Events that are stored after the query is completed are not included in the event stream.

core/src/main/scala-3/org/apache/pekko/persistence/postgres/db/ExtendedPostgresProfile.scala renamed to core/src/main/scala/org/apache/pekko/persistence/postgres/db/ExtendedPostgresProfile.scala

@@ -16,15 +16,15 @@ The main goal is to keep index size and memory consumption on a moderate level w
 To use `pekko-persistence-postgres` in your SBT project, add the following to your `build.sbt`:
 
 ```scala
-libraryDependencies += "com.swissborg" %% "pekko-persistence-postgres" % "0.7.0"
+libraryDependencies += "com.swissborg" %% "pekko-persistence-postgres" % "0.8.0-RC1"
 ```
 
 For a maven project add:
 ```xml
 <dependency>
     <groupId>com.swissborg</groupId>
     <artifactId>pekko-persistence-postgres_2.13</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0-RC1</version>
 </dependency>
 ```
 to your `pom.xml`.

core/src/main/scala/org/apache/pekko/persistence/postgres/query/scaladsl/PostgresReadJournal.scala

@@ -7,7 +7,7 @@ object Dependencies {
 
   object Libraries {
     object Pekko {
-      private val Version = "1.0.1"
+      private val Version = "1.1.0"
 
       def slf4j = "org.apache.pekko" %% "pekko-slf4j" % Version
       def persistence = "org.apache.pekko" %% "pekko-persistence-query" % Version
@@ -28,43 +28,23 @@ object Dependencies {
       def postgresql = "org.postgresql" % "postgresql" % PostgresqlVersion
     }
 
-    sealed trait Slick {
-      protected val SlickVersion: String
-      protected val SlickPgVersion: String
+    object Slick {
+      private val SlickVersion = "3.5.1"
+      private val SlickPgVersion = "0.22.2"
 
       def slick = "com.typesafe.slick" %% "slick" % SlickVersion
       def slickHikariCP = "com.typesafe.slick" %% "slick-hikaricp" % SlickVersion
       def slickPg = "com.github.tminglei" %% "slick-pg" % SlickPgVersion
       def slickPgCirce = "com.github.tminglei" %% "slick-pg_circe-json" % SlickPgVersion
     }
 
-    object SlickForScala2 extends Slick {
-      override protected val SlickVersion = "3.4.1"
-      override protected val SlickPgVersion = "0.21.1"
-    }
-
-    object SlickForScala3 extends Slick {
-      override protected val SlickVersion = "3.5.1"
-      override protected val SlickPgVersion = "0.22.2"
-    }
-
-    private val common: Seq[ModuleID] = Seq(
+    val core: Seq[ModuleID] = Seq(
       Pekko.persistence % Provided,
-      Misc.scaffeine
-    )
-
-    val scala2: Seq[ModuleID] = common ++ Seq(
-      SlickForScala2.slick,
-      SlickForScala2.slickHikariCP,
-      SlickForScala2.slickPg,
-      SlickForScala2.slickPgCirce
-    )
-
-    val scala3: Seq[ModuleID] = common ++ Seq(
-      SlickForScala3.slick,
-      SlickForScala3.slickHikariCP,
-      SlickForScala3.slickPg,
-      SlickForScala3.slickPgCirce
+      Misc.scaffeine,
+      Slick.slick,
+      Slick.slickHikariCP,
+      Slick.slickPg,
+      Slick.slickPgCirce
     )
 
     val testing: Seq[ModuleID] = Seq(