chore: bump to akka 2.10.0-M1 (#74)

akka · Oct 4, 2024 · fb36bc5 · fb36bc5
1 parent edecd0a
commit fb36bc5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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