chore: bump to akka-http to 10.7.0-M1, akka to 2.10.0-M1, align with changes from upstream (#1977)

Author: sebastian-alfers

.scala-steward.conf

@@ -32,8 +32,6 @@ updates.pin = [
   { groupId = "org.eclipse.jgit", artifactId = "org.eclipse.jgit", version = "5." },
 
   # https://github.com/akka/akka-grpc/issues/1661
-  { groupId = "org.slf4j", artifactId = "slf4j-api", version = "1." }
-  # logback 1.3 and 1.4 would bump sfl4j to 2.0.0
-  # http://mailman.qos.ch/pipermail/announce/2022/000177.html
-  { groupId = "ch.qos.logback", artifactId = "logback-classic", version = "1.2." }
+  { groupId = "org.slf4j", artifactId = "slf4j-api", version = "2.0." }
+  { groupId = "ch.qos.logback", artifactId = "logback-classic", version = "1.5." }
 ]

benchmarks/src/main/scala/akka/grpc/BenchRunner.scala

@@ -11,7 +11,7 @@ import org.openjdk.jmh.runner.options.CommandLineOptions
 object BenchRunner {
 
   def main(args: Array[String]): Unit = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
 
     // @formatter:off
     val args2 = args.toList.flatMap {

build.sbt

@@ -30,10 +30,10 @@ lazy val codegen = Project(id = akkaGrpcCodegenId, base = file("codegen"))
     },
     buildInfoKeys ++= Seq[BuildInfoKey](organization, name, version, scalaVersion, sbtVersion),
     buildInfoKeys += "runtimeArtifactName" -> akkaGrpcRuntimeName,
-    buildInfoKeys += "akkaVersion" → Dependencies.Versions.akka,
-    buildInfoKeys += "akkaHttpVersion" → Dependencies.Versions.akkaHttp,
-    buildInfoKeys += "grpcVersion" → Dependencies.Versions.grpc,
-    buildInfoKeys += "googleProtobufVersion" → Dependencies.Versions.googleProtobuf,
+    buildInfoKeys += "akkaVersion" -> Dependencies.Versions.akka,
+    buildInfoKeys += "akkaHttpVersion" -> Dependencies.Versions.akkaHttp,
+    buildInfoKeys += "grpcVersion" -> Dependencies.Versions.grpc,
+    buildInfoKeys += "googleProtobufVersion" -> Dependencies.Versions.googleProtobuf,
     buildInfoPackage := "akka.grpc.gen",
     (Compile / assembly / artifact) := {
       val art = (Compile / assembly / artifact).value

codegen/src/main/scala/akka/grpc/gen/javadsl/JavaCodeGenerator.scala

@@ -10,7 +10,7 @@ import protocbridge.Artifact
 import templates.JavaCommon.txt.ApiInterface
 
 import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable
 import protocgen.CodeGenRequest
 

codegen/src/main/scala/akka/grpc/gen/javadsl/Service.scala

@@ -9,7 +9,7 @@ import protocgen.CodeGenRequest
 import scalapb.compiler.{ DescriptorImplicits, GeneratorParams }
 
 import scala.annotation.tailrec
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable
 
 final case class Service(

codegen/src/main/scala/akka/grpc/gen/scaladsl/ScalaCodeGenerator.scala

@@ -5,7 +5,7 @@
 package akka.grpc.gen.scaladsl
 
 import scala.annotation.nowarn
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable
 import akka.grpc.gen.{ BuildInfo, CodeGenerator, Logger }
 import com.google.protobuf.compiler.PluginProtos.{ CodeGeneratorRequest, CodeGeneratorResponse }

codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala

@@ -5,7 +5,7 @@
 package akka.grpc.gen.scaladsl
 
 import scala.collection.immutable
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import com.google.protobuf.Descriptors._
 import protocgen.CodeGenRequest
 import scalapb.compiler.{ DescriptorImplicits, GeneratorParams }

maven-plugin/src/main/scala/akka/grpc/maven/AbstractGenerateMojo.scala

@@ -77,7 +77,7 @@ object AbstractGenerateMojo {
    * e.g. { "flatPackage": "true", "serverPowerApis": "false" } -> ["flat_package"]
    */
   def parseGeneratorSettings(generatorSettings: java.util.Map[String, String]): Seq[String] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     generatorSettings.asScala.filter(_._2.toLowerCase() != "false").keys.toSeq.map { params =>
       "[A-Z]".r.replaceAllIn(params, (s => s"_${s.group(0).toLowerCase()}"))
     }
@@ -110,7 +110,7 @@ abstract class AbstractGenerateMojo @Inject() (buildContext: BuildContext) exten
   @BeanProperty
   var generatePlayServer: Boolean = _
 
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
   @BeanProperty
   var generatorSettings: java.util.Map[String, String] = _
 

maven-plugin/src/test/scala/akka/grpc/maven/ProtocSpec.scala

@@ -22,7 +22,7 @@ class ProtocSpec extends AnyWordSpec with Matchers {
     }
   }
 
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   "Parsing generator settings" should {
     "filter out the false values" in {

native-image-tests/grpc-scala/build.sbt

@@ -4,7 +4,7 @@ version := "1.0"
 
 scalaVersion := "2.13.14"
 
-lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.3")
+lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1")
 lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.4.0")
 
 enablePlugins(AkkaGrpcPlugin)