Scala 3 support #775

jtjeferreira · 2023-10-16T09:58:31Z

Adds scala 3 support

lightbend-cla-validator · 2023-10-16T09:58:34Z

Thank you for your contribution! We really value the time you've taken to put this together.

We see that you have signed the Lightbend Contributors License Agreement before, however, the CLA has changed since you last signed it.
Please review the new CLA and sign it before we proceed with reviewing this pull request:

http://www.lightbend.com/contribute/cla

johanandren

We'll need a non-milestone Slick release before we can merge this to main. Good to have this prepared once that arrives though! 👍

johanandren · 2024-02-14T15:02:47Z

Hey @jtjeferreira any chance you have time to rebase on master to solve the conflict so we can see if Slick 3.5.0 RC1 works?

jtjeferreira · 2024-02-14T19:00:33Z

Hey @jtjeferreira any chance you have time to rebase on master to solve the conflict so we can see if Slick 3.5.0 RC1 works?

I tried the "Resolve Conflicts" from the GitHub UI on my phone and the conflict seems simple. I will have a look tomorrow...

jtjeferreira · 2024-02-15T10:56:15Z

Hey @jtjeferreira any chance you have time to rebase on master to solve the conflict so we can see if Slick 3.5.0 RC1 works?

I tried the "Resolve Conflicts" from the GitHub UI on my phone and the conflict seems simple. I will have a look tomorrow...

I fixed the conflicts. Can you approve the workflows?

PS: There is a test that will fail, due to a compiler bug

[info] H2ScalaEventsByTagMigrationTest:
[info] - should migrate event tag to new way *** FAILED *** (2 milliseconds)
[info]   java.lang.ClassCastException: class com.typesafe.config.impl.SimpleConfig cannot be cast to class java.lang.String (com.typesafe.config.impl.SimpleConfig is in unnamed module of loader sbt.internal.LayeredClassLoader @611cd810; java.lang.String is in module java.base of loader 'bootstrap')
[info]   at akka.persistence.jdbc.query.EventsByTagMigrationTest.config$accessor(EventsByTagMigrationTest.scala:31)
[info]   at akka.persistence.jdbc.query.EventsByTagMigrationTest.withRollingUpdateActorSystem(EventsByTagMigrationTest.scala:161)
[info]   at akka.persistence.jdbc.query.EventsByTagMigrationTest.testFun$proxy1$1(EventsByTagMigrationTest.scala:188)
[info]   at akka.persistence.jdbc.query.EventsByTagMigrationTest.$init$$$anonfun$1(EventsByTagMigrationTest.scala:171)

I will push the fix after so we can have proof of the bug (and the bugfix)

jtjeferreira · 2024-02-15T14:48:43Z

Thanks for approving the workflows. There are 2 issues:

I haven't changed the workflows to use scala3. Any tip where I should do that? .github/workflows/checks.yml? Any examples from other akka projects I could follow?
Mima warnings in 2.13 on JdbcBackend#DatabaseDef vs JdbcBackend#JdbcDatabaseDef which changed in slick 3.5.0. Can I add a mima filter?

johanandren · 2024-02-16T08:26:56Z

I pushed a commit adding Test/compile on Scala 3 to CI PR validation now. There are some related failures to look into - methods that end up with the same signature after erasure.

johanandren

Looks good so far! Some smaller things and the conflicting overloads and this is as ready as it gets until slick 3.5.0 is released 👍

core/src/main/mima-filters/5.4.0.backwards.excludes/issue-775-slick-3.50.excludes

johanandren · 2024-02-16T09:12:54Z

core/src/main/mima-filters/5.4.0.backwards.excludes/issue-775-slick-3.50.excludes

+
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.SlickDatabase.forConfig")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.SlickDatabase.database")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.persistence.jdbc.db.SlickDatabase.database")


SlickDatabase already is internal, so this is fine

johanandren · 2024-02-16T09:15:36Z

core/src/main/mima-filters/5.4.0.backwards.excludes/issue-775-slick-3.50.excludes

+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.snapshot.dao.DefaultSnapshotDao.this")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.state.JdbcDurableStateStoreProvider.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.state.scaladsl.JdbcDurableStateStore.this")


Both fine to exclude:

Constructor isn't used by user code (instantiated by akka-persistence). A bit curious that it shows up, I can't see that it wasn't touched for any of the listed types though.

db field shouldn't ever be touched by user code, effectively protected.

johanandren · 2024-02-16T09:22:00Z

core/src/main/scala/akka/persistence/jdbc/query/JdbcReadJournalProvider.scala


-  override val javadslReadJournal = new javadsl.JdbcReadJournal(scaladslReadJournal)
+  override def javadslReadJournal(): javadsl.JdbcReadJournal = new javadsl.JdbcReadJournal(scaladslReadJournal())


The returned instances are cached and shared by akka-persistence internals so this change is fine. 👍

johanandren · 2024-02-16T09:27:23Z

core/src/main/scala/akka/persistence/jdbc/query/JournalSequenceActor.scala

    def addRange(from: OrderingId, until: OrderingId): MissingElements = {
      val newRange = from.until(until)
      MissingElements(elements :+ newRange)
    }
    def contains(id: OrderingId): Boolean = elements.exists(_.containsTyped(id))
    def isEmpty: Boolean = elements.forall(_.isEmpty)
  }
-  private object MissingElements {
+  object MissingElements {


Make the multi-param JournalSequenceActor.receive(currentMaxOrdering ...) private instead of changing these (it's an internal factory for Receive instances, not called from the outside)

johanandren · 2024-02-16T09:28:51Z

core/src/main/scala/akka/persistence/jdbc/state/scaladsl/DurableStateSequenceActor.scala

@@ -46,7 +46,7 @@ import akka.annotation.InternalApi
   * Efficient representation of missing elements using NumericRanges.
   * It can be seen as a collection of GlobalOffset
   */
-  private case class MissingElements(elements: Seq[NumericRange[GlobalOffset]]) {
+  case class MissingElements(elements: Seq[NumericRange[GlobalOffset]]) {


Same here, make the method private instead

jtjeferreira · 2024-02-16T09:31:38Z

I pushed a commit adding Test/compile on Scala 3 to CI PR validation now.

Thanks

There are some related failures to look into - methods that end up with the same signature after erasure.

I have seen that error locally. If I comment the @ApiMayChange it compiles. If I add it again and compile incrementally it works... I guess this is another compiler bug?

…equenceActor

johanandren · 2024-02-16T10:19:15Z

If I comment the @ApiMayChange it compiles. If I add it again and compile incrementally it works... I guess this is another compiler bug?

Sounds like that, removing that annotation and adding Scaladoc saying it "API may change" is fine IMO

jtjeferreira · 2024-02-16T11:39:05Z

If I comment the @ApiMayChange it compiles. If I add it again and compile incrementally it works... I guess this is another compiler bug?

Sounds like that, removing that annotation and adding Scaladoc saying it "API may change" is fine IMO

Meanwhile, I found a workaround (see 45bbe4a).

I think I addressed all your feedback and also fixed mima after e6422a4

johanandren · 2024-02-16T12:01:21Z

Even better 👍

…ing persisted when the query is executed" increase toStrict timeout

jtjeferreira · 2024-02-16T14:33:03Z

Regarding the failure in H2ScalaCurrentEventsByTagTest#should complete without any gaps in case events are being persisted when the query is executed I was also facing the problem locally, but I was hoping it was due to some slowness in my machine.

I fixed it with 7199f96, but I wonder if this is a problem with slick 3.5.0...

johanandren

LGTM, thanks for the good work @jtjeferreira !

jtjeferreira · 2024-03-08T11:21:35Z

LGTM, thanks for the good work @jtjeferreira !

Thanks. Looking forward for a release

jtjeferreira · 2024-03-08T11:24:00Z

Looks like there is a problem in docs https://github.com/akka/akka-persistence-jdbc/actions/runs/8201918926/job/22431619062:

[error] missing argument for option -skip-packages

compiles

dd1540c

johanandren reviewed Oct 16, 2023

View reviewed changes

scalafmt

245acc3

patriknw mentioned this pull request Oct 31, 2023

akka-projection-slick Scala 3 artifact/support/cross-build akka/akka-projection#1057

Closed

slick 3.5.0-RC1 out now

33aec59

Merge remote-tracking branch 'upstream/master' into scala3

0fb0d75

jtjeferreira added 3 commits February 15, 2024 16:47

mima filters

87cedb0

remove tupled methods to reduce the number of mima violations

1f123ed

no mimaPreviousArtifacts if running scala3

42d18ad

jtjeferreira requested a review from johanandren February 15, 2024 17:26

johanandren added 2 commits February 16, 2024 09:03

Formatting

f8c9ff3

PR validation with added 3.3 Test/compile

2fc72ee

johanandren reviewed Feb 16, 2024

View reviewed changes

jtjeferreira added 3 commits February 16, 2024 09:41

fix cyclic reference compiler error by moving import of DurableStateS…

45bbe4a

…equenceActor

mark EagerSlickDatabase and LazySlickDatabase as internal

bafa917

make MissingElements private again

e6422a4

fix mima after making some methods private in JournalSequenceActor

5ceb36e

jtjeferreira requested a review from johanandren February 16, 2024 11:39

fix timeout in teste "complete without any gaps in case events are be…

7199f96

…ing persisted when the query is executed" increase toStrict timeout

jtjeferreira added 2 commits February 17, 2024 00:44

workaround scala3 bug scala/scala3#19711

20f619f

Merge branch 'master' into scala3

bcc8a0b

johanandren mentioned this pull request Mar 8, 2024

Version bumps - especially Slick 3.5.0 #804

Closed

bump: slick 3.5.0

19f4841

johanandren approved these changes Mar 8, 2024

View reviewed changes

johanandren merged commit df901fa into akka:master Mar 8, 2024
14 checks passed

johanandren modified the milestones: 5.3.1, 5.4.0 Mar 8, 2024

johanandren mentioned this pull request Mar 8, 2024

build: Incorrect flags for Scala 3 scalac blocking publish #805

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Scala 3 support #775

Scala 3 support #775

jtjeferreira commented Oct 16, 2023

lightbend-cla-validator commented Oct 16, 2023

johanandren left a comment

johanandren commented Feb 14, 2024

jtjeferreira commented Feb 14, 2024

jtjeferreira commented Feb 15, 2024

jtjeferreira commented Feb 15, 2024

johanandren commented Feb 16, 2024

johanandren left a comment

johanandren Feb 16, 2024

johanandren Feb 16, 2024

johanandren Feb 16, 2024

johanandren Feb 16, 2024

johanandren Feb 16, 2024

jtjeferreira commented Feb 16, 2024

johanandren commented Feb 16, 2024

jtjeferreira commented Feb 16, 2024

johanandren commented Feb 16, 2024

jtjeferreira commented Feb 16, 2024

johanandren left a comment

jtjeferreira commented Mar 8, 2024

jtjeferreira commented Mar 8, 2024


		override val javadslReadJournal = new javadsl.JdbcReadJournal(scaladslReadJournal)
		override def javadslReadJournal(): javadsl.JdbcReadJournal = new javadsl.JdbcReadJournal(scaladslReadJournal())

Scala 3 support #775

Scala 3 support #775

Conversation

jtjeferreira commented Oct 16, 2023

lightbend-cla-validator commented Oct 16, 2023

johanandren left a comment

Choose a reason for hiding this comment

johanandren commented Feb 14, 2024

jtjeferreira commented Feb 14, 2024

jtjeferreira commented Feb 15, 2024

jtjeferreira commented Feb 15, 2024

johanandren commented Feb 16, 2024

johanandren left a comment

Choose a reason for hiding this comment

johanandren Feb 16, 2024

Choose a reason for hiding this comment

johanandren Feb 16, 2024

Choose a reason for hiding this comment

johanandren Feb 16, 2024

Choose a reason for hiding this comment

johanandren Feb 16, 2024

Choose a reason for hiding this comment

johanandren Feb 16, 2024

Choose a reason for hiding this comment

jtjeferreira commented Feb 16, 2024

johanandren commented Feb 16, 2024

jtjeferreira commented Feb 16, 2024

johanandren commented Feb 16, 2024

jtjeferreira commented Feb 16, 2024

johanandren left a comment

Choose a reason for hiding this comment

jtjeferreira commented Mar 8, 2024

jtjeferreira commented Mar 8, 2024