From fb36bc574ea886f7523daf1b1b56326ec1cbc732 Mon Sep 17 00:00:00 2001
From: Sebastian Alfers <sebastian.alfers@lightbend.com>
Date: Fri, 4 Oct 2024 08:16:19 +0200
Subject: [PATCH] chore: bump to akka 2.10.0-M1 (#74)

---
 .../src/main/scala/akka/diagnostics/ConfigChecker.scala       | 3 +--
 .../src/test/scala/akka/diagnostics/AkkaSpec.scala            | 2 +-
 .../src/test/scala/akka/diagnostics/ConfigCheckerSpec.scala   | 2 +-
 build.sbt                                                     | 2 +-
 project/Dependencies.scala                                    | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/akka-diagnostics/src/main/scala/akka/diagnostics/ConfigChecker.scala b/akka-diagnostics/src/main/scala/akka/diagnostics/ConfigChecker.scala
index 74c7762..1726942 100644
--- a/akka-diagnostics/src/main/scala/akka/diagnostics/ConfigChecker.scala
+++ b/akka-diagnostics/src/main/scala/akka/diagnostics/ConfigChecker.scala
@@ -8,10 +8,10 @@ import java.util
 import java.util.Locale
 import java.util.concurrent.TimeUnit.MILLISECONDS
 
-import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.collection.immutable.VectorBuilder
 import scala.concurrent.duration._
+import scala.jdk.CollectionConverters._
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
@@ -213,7 +213,6 @@ class ConfigChecker(system: ExtendedActorSystem, config: Config, reference: Conf
   private val knownDispatcherPrefixes = Set("akka.", "lagom.", "play.", "cassandra-plugin-", "kafka.")
 
   private val knownSettings = {
-    import scala.collection.JavaConverters._
     def collectLeaves(path: String, list: ConfigObject): Seq[(String, String)] =
       list
         .entrySet()
diff --git a/akka-diagnostics/src/test/scala/akka/diagnostics/AkkaSpec.scala b/akka-diagnostics/src/test/scala/akka/diagnostics/AkkaSpec.scala
index 1375b6b..e3317e3 100644
--- a/akka-diagnostics/src/test/scala/akka/diagnostics/AkkaSpec.scala
+++ b/akka-diagnostics/src/test/scala/akka/diagnostics/AkkaSpec.scala
@@ -45,7 +45,7 @@ object AkkaSpec {
                                                     """)
 
   def mapToConfig(map: Map[String, Any]): Config = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     ConfigFactory.parseMap(map.asJava)
   }
 
diff --git a/akka-diagnostics/src/test/scala/akka/diagnostics/ConfigCheckerSpec.scala b/akka-diagnostics/src/test/scala/akka/diagnostics/ConfigCheckerSpec.scala
index 608bb7f..187c51c 100644
--- a/akka-diagnostics/src/test/scala/akka/diagnostics/ConfigCheckerSpec.scala
+++ b/akka-diagnostics/src/test/scala/akka/diagnostics/ConfigCheckerSpec.scala
@@ -14,8 +14,8 @@ import akka.testkit.EventFilter
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 
-import scala.collection.JavaConverters._
 import scala.collection.immutable
+import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 class ConfigCheckerSpec extends AkkaSpec {
diff --git a/build.sbt b/build.sbt
index 1aef02b..2dd5b20 100644
--- a/build.sbt
+++ b/build.sbt
@@ -96,7 +96,7 @@ lazy val common: Seq[Setting[_]] =
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
     Test / fork := true, // some non-heap memory is leaking
     Test / javaOptions ++= {
-      import scala.collection.JavaConverters._
+      import scala.jdk.CollectionConverters._
       val akkaProperties = System.getProperties.stringPropertyNames.asScala.toList.collect {
         case key: String if key.startsWith("akka.") => "-D" + key + "=" + System.getProperty(key)
       }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1b56c22..630be0c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,9 +12,9 @@ object Dependencies {
   val Scala3 = "3.3.3"
   val CrossScalaVersions = Seq(Scala213, Scala3)
 
-  val AkkaVersion = "2.9.3"
+  val AkkaVersion = "2.10.0-M1"
   val AkkaVersionInDocs = VersionNumber(AkkaVersion).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }
-  val AkkaHttpVersionInDocs = "10.6"
+  val AkkaHttpVersionInDocs = "10.7"
   val ScalaTestVersion = "3.2.18"
 
   val commonsText = "org.apache.commons" % "commons-text" % "1.11.0" // ApacheV2