Skip to content

Commit 6e0a7ff

Browse files
author
Tiago Mota
committed
Update to Pekko to 1.1.0
1 parent bac3992 commit 6e0a7ff

File tree

5 files changed

+13
-83
lines changed

5 files changed

+13
-83
lines changed

build.sbt

+2-7
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ lazy val core = project
1313
.settings(
1414
name := "pekko-persistence-postgres",
1515
mimaBinaryIssueFilters ++= Seq(),
16-
libraryDependencies ++= {
17-
(CrossVersion.partialVersion(scalaVersion.value) match {
18-
case Some((3, _)) => Dependencies.Libraries.scala3
19-
case _ => Dependencies.Libraries.scala2
20-
})
21-
} ++ Dependencies.Libraries.testing
16+
libraryDependencies ++= Dependencies.Libraries.core ++ Dependencies.Libraries.testing
2217
)
2318

2419
TaskKey[Unit]("verifyCodeFmt") := {
@@ -32,4 +27,4 @@ TaskKey[Unit]("verifyCodeFmt") := {
3227
"Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code"
3328
)
3429
}
35-
}
30+
}

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

-45
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class PostgresReadJournal(config: Config, configPath: String)(implicit val syste
8787
s"$configPath.pekko-persistence-postgres-journal-sequence-actor"
8888
)
8989
private val delaySource =
90-
Source.tick(readJournalConfig.refreshInterval, 0.seconds, 0).take(1)
90+
Source.tick(readJournalConfig.refreshInterval, readJournalConfig.refreshInterval, 0).take(1)
9191

9292
/** Same type of query as `persistenceIds` but the event stream is completed immediately when it reaches the end of
9393
* the "result set". Events that are stored after the query is completed are not included in the event stream.

project/Dependencies.scala

+10-30
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object Dependencies {
77

88
object Libraries {
99
object Pekko {
10-
private val Version = "1.0.1"
10+
private val Version = "1.1.0"
1111

1212
def slf4j = "org.apache.pekko" %% "pekko-slf4j" % Version
1313
def persistence = "org.apache.pekko" %% "pekko-persistence-query" % Version
@@ -28,43 +28,23 @@ object Dependencies {
2828
def postgresql = "org.postgresql" % "postgresql" % PostgresqlVersion
2929
}
3030

31-
sealed trait Slick {
32-
protected val SlickVersion: String
33-
protected val SlickPgVersion: String
31+
object Slick {
32+
private val SlickVersion = "3.5.1"
33+
private val SlickPgVersion = "0.22.2"
3434

3535
def slick = "com.typesafe.slick" %% "slick" % SlickVersion
3636
def slickHikariCP = "com.typesafe.slick" %% "slick-hikaricp" % SlickVersion
3737
def slickPg = "com.github.tminglei" %% "slick-pg" % SlickPgVersion
3838
def slickPgCirce = "com.github.tminglei" %% "slick-pg_circe-json" % SlickPgVersion
3939
}
4040

41-
object SlickForScala2 extends Slick {
42-
override protected val SlickVersion = "3.4.1"
43-
override protected val SlickPgVersion = "0.21.1"
44-
}
45-
46-
object SlickForScala3 extends Slick {
47-
override protected val SlickVersion = "3.5.1"
48-
override protected val SlickPgVersion = "0.22.2"
49-
}
50-
51-
private val common: Seq[ModuleID] = Seq(
41+
val core: Seq[ModuleID] = Seq(
5242
Pekko.persistence % Provided,
53-
Misc.scaffeine
54-
)
55-
56-
val scala2: Seq[ModuleID] = common ++ Seq(
57-
SlickForScala2.slick,
58-
SlickForScala2.slickHikariCP,
59-
SlickForScala2.slickPg,
60-
SlickForScala2.slickPgCirce
61-
)
62-
63-
val scala3: Seq[ModuleID] = common ++ Seq(
64-
SlickForScala3.slick,
65-
SlickForScala3.slickHikariCP,
66-
SlickForScala3.slickPg,
67-
SlickForScala3.slickPgCirce
43+
Misc.scaffeine,
44+
Slick.slick,
45+
Slick.slickHikariCP,
46+
Slick.slickPg,
47+
Slick.slickPgCirce
6848
)
6949

7050
val testing: Seq[ModuleID] = Seq(

0 commit comments

Comments
 (0)