diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml index 94c77bec7e..3130213295 100644 --- a/.github/workflows/scala3-build.yml +++ b/.github/workflows/scala3-build.yml @@ -23,7 +23,7 @@ jobs: - akka-bench-jmh/test - akka-cluster/Test/compile akka-cluster-tools/test akka-cluster-typed/test akka-distributed-data/test akka-cluster-metrics/Test/compile akka-cluster-sharding/Test/compile akka-cluster-sharding-typed/compile - akka-discovery/test akka-coordination/test - - akka-persistence/test akka-persistence-shared/test akka-persistence-query/test + - akka-persistence/test akka-persistence-shared/test akka-persistence-query/test akka-persistence-typed/test akka-persistence-testkit/test - akka-pki/test akka-slf4j/test - akka-serialization-jackson/test - akka-stream/test akka-stream-testkit/test akka-stream-tests/test diff --git a/.github/workflows/scala3-compile.yml b/.github/workflows/scala3-compile.yml index 01557712db..fff98d3d58 100644 --- a/.github/workflows/scala3-compile.yml +++ b/.github/workflows/scala3-compile.yml @@ -21,7 +21,7 @@ jobs: - akka-bench-jmh/Test/compile - akka-cluster/Test/compile akka-cluster-tools/Test/compile akka-cluster-typed/Test/compile akka-distributed-data/Test/compile akka-cluster-metrics/Test/compile akka-cluster-sharding/Test/compile akka-cluster-sharding-typed/compile - akka-discovery/Test/compile akka-coordination/Test/compile - - akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile + - akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile akka-persistence-typed/Test/compile akka-persistence-testkit/Test/compile - akka-pki/Test/compile akka-slf4j/Test/compile - akka-serialization-jackson/Test/compile - akka-stream/Test/compile akka-stream-testkit/Test/compile akka-stream-tests/Test/compile diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala index 3257b0c1f8..b287a08804 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala @@ -442,7 +442,8 @@ class PersistenceTestKit(system: ActorSystem) import PersistenceTestKit._ - override protected val storage = InMemStorageExtension(system).storageFor(PersistenceTestKitPlugin.PluginId) + override protected val storage: EventStorage = + InMemStorageExtension(system).storageFor(PersistenceTestKitPlugin.PluginId) private final lazy val settings = Settings(system) diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala index 89498bf8d2..673c0e5dc0 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala @@ -56,7 +56,7 @@ private[testkit] trait RejectSupport[U] { } -private[testkit] trait PolicyOpsTestKit[P] extends { +private[testkit] trait PolicyOpsTestKit[P] { this: HasStorage[P, _] => private[testkit] val Policies: DefaultPolicies[P] diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala index b3be044944..cc48978f8a 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala @@ -31,7 +31,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem) extends DurableStateUpdateStore[A] with DurableStateStoreQuery[A] { - private implicit val sys = system + private implicit val sys: ExtendedActorSystem = system private var store = Map.empty[String, Record[A]] private val (publisher, changesSource) = @@ -76,7 +76,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem) .statefulMapConcat { () => var globalOffsetSeen = EarliestOffset - { record: Record[A] => + { (record: Record[A]) => if (record.globalOffset > globalOffsetSeen) { globalOffsetSeen = record.globalOffset record :: Nil diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala index f7ced53162..4b396dfc51 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala @@ -16,7 +16,7 @@ import akka.util.ccompat.JavaConverters._ trait CommonSnapshotTests extends JavaDslUtils { - lazy val testKit = new SnapshotTestKit(system) + final lazy val testKit = new SnapshotTestKit(system) import testKit._ def specificTests(): Unit diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala index ca6f1e6f10..613624ebc9 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala @@ -15,7 +15,7 @@ import akka.util.ccompat.JavaConverters._ trait CommonTestKitTests extends JavaDslUtils { - lazy val testKit = new PersistenceTestKit(system) + final lazy val testKit = new PersistenceTestKit(system) import testKit._ def specificTests(): Unit diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala index f8c7765184..bea534df52 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/CurrentEventsByTagSpec.scala @@ -21,7 +21,7 @@ class CurrentEventsByTagSpec with LogCapturing with AnyWordSpecLike { - implicit val classic = system.classicSystem + implicit val classic: akka.actor.ActorSystem = system.classicSystem val queries = PersistenceQuery(system).readJournalFor[PersistenceTestKitReadJournal](PersistenceTestKitReadJournal.Identifier) diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala index 93db5e89ae..56826fb872 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/query/EventsByPersistenceIdSpec.scala @@ -48,7 +48,7 @@ class EventsByPersistenceIdSpec with AnyWordSpecLike { import EventsByPersistenceIdSpec._ - implicit val classic = system.classicSystem + implicit val classic: akka.actor.ActorSystem = system.classicSystem val queries = PersistenceQuery(system).readJournalFor[PersistenceTestKitReadJournal](PersistenceTestKitReadJournal.Identifier) diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala index 1da4845212..b4b35a6bae 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala @@ -15,7 +15,7 @@ import akka.testkit.EventFilter trait CommonSnapshotTests extends ScalaDslUtils { - lazy val testKit = new SnapshotTestKit(system) + final lazy val testKit = new SnapshotTestKit(system) import testKit._ def specificTests(): Unit @@ -71,7 +71,7 @@ trait CommonSnapshotTests extends ScalaDslUtils { expectNextPersistedType[Int](pid) should be(2) assertThrows[AssertionError] { - expectNextPersistedType(pid) + expectNextPersistedType[Any](pid) } } diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala index 2dc03a7a9e..410d1fa71b 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala @@ -14,7 +14,7 @@ import akka.testkit.EventFilter trait CommonTestKitTests extends ScalaDslUtils { - lazy val testKit = new PersistenceTestKit(system) + final lazy val testKit: PersistenceTestKit = new PersistenceTestKit(system) import testKit._ def specificTests(): Unit diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala index a9e6a664b5..2033f3c0dc 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/EventSourcedBehaviorTestKitSpec.scala @@ -53,10 +53,10 @@ object EventSourcedBehaviorTestKitSpec { case object NotSerializableCommand extends Command - final case class IncrementWithNotSerializableReply(replyTo: ActorRef[NotSerializableReply.type]) + final case class IncrementWithNotSerializableReply(replyTo: ActorRef[NotSerializableReply]) extends Command with CborSerializable - object NotSerializableReply + class NotSerializableReply def apply(persistenceId: PersistenceId): Behavior[Command] = apply(persistenceId, RealState(0, Vector.empty)) @@ -100,7 +100,7 @@ object EventSourcedBehaviorTestKitSpec { Effect.persist(IncrementedWithNotSerializableState(1)).thenNoReply() case IncrementWithNotSerializableReply(replyTo) => - Effect.persist(Incremented(1)).thenReply(replyTo)(_ => NotSerializableReply) + Effect.persist(Incremented(1)).thenReply(replyTo)(_ => new NotSerializableReply) case NotSerializableCommand => Effect.noReply @@ -277,7 +277,7 @@ class EventSourcedBehaviorTestKitSpec val eventSourcedTestKit = createTestKit() val exc = intercept[IllegalArgumentException] { - eventSourcedTestKit.runCommand(TestCounter.IncrementWithNotSerializableReply) + eventSourcedTestKit.runCommand(replyTo => TestCounter.IncrementWithNotSerializableReply(replyTo)) } (exc.getMessage should include).regex("Reply.*isn't serializable") exc.getCause.getClass should ===(classOf[NotSerializableException]) diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala index b975ad5ed5..810845ef10 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStoreSpec.scala @@ -32,7 +32,7 @@ class PersistenceTestKitDurableStateStoreSpec import PersistenceTestKitDurableStateStoreSpec._ - implicit val classic = system.classicSystem + implicit val classic: akka.actor.ActorSystem = system.classicSystem "Persistent test kit state store changes query" must { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d1381fb782..329741d0c3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,8 @@ object Dependencies { val scala212Version = "2.12.15" val scala213Version = "2.13.6" // To get the fix for https://github.com/lampepfl/dotty/issues/13106 - val scala3Version = "3.1.1-RC1-bin-20210915-ea871c2-NIGHTLY" + // and restored static forwarders + val scala3Version = "3.1.1-RC1-bin-20211007-c041327-NIGHTLY" val reactiveStreamsVersion = "1.0.3"