From deaed22e29ca4cbc5221d4b3b2517e77e554bad9 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 9 Jun 2023 19:18:59 +0100 Subject: [PATCH] support ironmq on scala3 --- .../ironmq/scaladsl/IronMqProducerSpec.scala | 10 +++++----- project/Dependencies.scala | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ironmq/src/test/scala/org/apache/pekko/stream/connectors/ironmq/scaladsl/IronMqProducerSpec.scala b/ironmq/src/test/scala/org/apache/pekko/stream/connectors/ironmq/scaladsl/IronMqProducerSpec.scala index 7ea34d67b..9bf875f04 100644 --- a/ironmq/src/test/scala/org/apache/pekko/stream/connectors/ironmq/scaladsl/IronMqProducerSpec.scala +++ b/ironmq/src/test/scala/org/apache/pekko/stream/connectors/ironmq/scaladsl/IronMqProducerSpec.scala @@ -80,11 +80,11 @@ class IronMqProducerSpec extends IronMqSpec { new MockCommittable, new MockCommittable) - whenReady( - messages - .zip(Source(committables)) - .via(atLeastOnceFlow(queue, settings, Flow[Committable].mapAsync(1)(_.commit()))) - .runWith(Sink.ignore)) { _ => + val future: Future[Done] = messages + .zip(Source(committables)) + .via(atLeastOnceFlow(queue, settings, Flow[Committable].mapAsync(1)(_.commit()))) + .runWith(Sink.ignore) + whenReady(future) { _ => committables.forall(_.committed) shouldBe true } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8e799923f..a1c89176f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -308,7 +308,6 @@ object Dependencies { )) val IronMq = Seq( - crossScalaVersions -= Scala3, libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, "org.mdedetrich" %% "pekko-stream-circe" % "0.0.0+94-dbf3173f-SNAPSHOT", // ApacheV2