Merge branch 'apache:main' into scalatest

apache · Jun 27, 2023 · 356225e · 356225e
2 parents 83bcb13 + 67ad9f4
commit 356225e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,15 +18,15 @@ object Dependencies {
   val Scala212 = "2.12.18"
   val ScalaVersions = Seq(Scala213, Scala212)
 
-  val PekkoVersionInDocs = "0.0.0+26656-898c6970-SNAPSHOT"
-  val ConnectorsVersionInDocs = "0.0.0+85-a82f3c3c-SNAPSHOT"
-  val ConnectorsKafkaVersionInDocs = "0.0.0+1728-e2c660ef-SNAPSHOT"
+  val PekkoVersionInDocs = "0.0.0+26669-ec5b6764-SNAPSHOT"
+  val ConnectorsVersionInDocs = "0.0.0+123-178795f6-SNAPSHOT"
+  val ConnectorsKafkaVersionInDocs = "0.0.0+1738-07a19b8e-SNAPSHOT"
 
   object Versions {
-    val pekko = sys.props.getOrElse("build.pekko.version", "0.0.0+26656-898c6970-SNAPSHOT")
-    val pekkoPersistenceJdbc = "0.0.0+966-e6f717eb-SNAPSHOT"
-    val connectors = "0.0.0+85-a82f3c3c-SNAPSHOT"
-    val connectorsKafka = sys.props.getOrElse("build.connectors.kafka.version", "0.0.0+1728-e2c660ef-SNAPSHOT")
+    val pekko = sys.props.getOrElse("build.pekko.version", PekkoVersionInDocs)
+    val pekkoPersistenceJdbc = "0.0.0+985-6b7eeb08-SNAPSHOT"
+    val connectors = ConnectorsVersionInDocs
+    val connectorsKafka = sys.props.getOrElse("build.connectors.kafka.version", ConnectorsKafkaVersionInDocs)
     val slick = "3.3.3"
     val scalaTest = "3.2.14"
     val testContainers = "1.15.3"
@@ -56,8 +56,6 @@ object Dependencies {
 
     // not really used in lib code, but in example and test
     val h2Driver = "com.h2database" % "h2" % Versions.h2Driver
-
-    val collectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.5.0"
   }
 
   object Test {
@@ -100,7 +98,7 @@ object Dependencies {
 
     val pekkoPersistenceTyped = "org.apache.pekko" %% "pekko-persistence-typed" % Versions.pekko
     val pekkoClusterShardingTyped = "org.apache.pekko" %% "pekko-cluster-sharding-typed" % Versions.pekko
-    val pekkoPersistenceCassandra = "org.apache.pekko" %% "pekko-persistence-cassandra" % "0.0.0-1079-c30f82ae-SNAPSHOT"
+    val pekkoPersistenceCassandra = "org.apache.pekko" %% "pekko-persistence-cassandra" % "0.0.0-1097-3f489113-SNAPSHOT"
     val pekkoPersistenceJdbc = "org.apache.pekko" %% "pekko-persistence-jdbc" % Versions.pekkoPersistenceJdbc
     val pekkoSerializationJackson = "org.apache.pekko" %% "pekko-serialization-jackson" % Versions.pekko
   }
@@ -132,7 +130,6 @@ object Dependencies {
     deps ++= Seq(
       Compile.pekkoTypedTestkit,
       Compile.pekkoStreamTestkit,
-      Compile.collectionCompat,
       Test.scalatest,
       Test.scalatestJUnit,
       Test.junit,

diff --git a/.../src/main/scala/org/apache/pekko/projection/testkit/internal/TestOffsetStoreAdapter.scala b/.../src/main/scala/org/apache/pekko/projection/testkit/internal/TestOffsetStoreAdapter.scala
@@ -13,7 +13,6 @@
 
 package org.apache.pekko.projection.testkit.internal
 
-import scala.jdk.CollectionConverters._
 import scala.concurrent.Future
 
 import org.apache.pekko
@@ -22,6 +21,7 @@ import pekko.annotation.InternalApi
 import pekko.projection.ProjectionId
 import pekko.projection.internal.ManagementState
 import pekko.projection.testkit.scaladsl.TestOffsetStore
+import pekko.util.ccompat.JavaConverters._
 import pekko.util.OptionConverters._
 import pekko.util.FutureConverters._