Scala 2.13.0 rc2 (#26967)

akka-docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala

@@ -400,7 +400,7 @@ class DistributedDataDocSpec extends AkkaSpec(DistributedDataDocSpec.config) {
   }
 
   "test japi.TwoPhaseSetSerializer" in {
-    import scala.collection.JavaConverters._
+    import akka.util.ccompat.JavaConverters._
     val s1 = ddata.TwoPhaseSet.create().add("a").add("b").add("c").remove("b")
     s1.getElements.asScala should be(Set("a", "c"))
     val serializer = SerializationExtension(system).findSerializerFor(s1)

akka-docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala

@@ -7,7 +7,7 @@ package docs.ddata.protobuf
 //#serializer
 import java.util.ArrayList
 import java.util.Collections
-import scala.collection.JavaConverters._
+import akka.util.ccompat.JavaConverters._
 import akka.actor.ExtendedActorSystem
 import akka.cluster.ddata.GSet
 import akka.cluster.ddata.protobuf.SerializationSupport

akka-docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala

@@ -13,7 +13,7 @@ import akka.testkit.TestKit
 import org.scalatest.{ BeforeAndAfter, WordSpecLike }
 import org.scalatest.BeforeAndAfterAll
 import akka.testkit.SocketUtil
-import scala.collection.JavaConverters._
+import akka.util.ccompat.JavaConverters._
 
 class ScalaUdpMulticastSpec
     extends TestKit(ActorSystem("ScalaUdpMulticastSpec"))

akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala

@@ -126,7 +126,7 @@ object PersistenceQueryDocSpec {
     // possibility to add more plugin specific queries
 
     def byTagsWithMeta(tags: java.util.Set[String]): javadsl.Source[RichEvent, QueryMetadata] = {
-      import scala.collection.JavaConverters._
+      import akka.util.ccompat.JavaConverters._
       scaladslReadJournal.byTagsWithMeta(tags.asScala.toSet).asJava
     }
   }

akka-docs/src/test/scala/docs/routing/RouterDocSpec.scala

@@ -24,7 +24,7 @@ import akka.routing.ScatterGatherFirstCompletedPool
 import akka.routing.BalancingPool
 import akka.routing.TailChoppingGroup
 import akka.routing.TailChoppingPool
-import scala.collection.JavaConverters._
+import akka.util.ccompat.JavaConverters._
 
 object RouterDocSpec {
 

akka-docs/src/test/scala/docs/stream/GraphStageDocSpec.scala

@@ -349,7 +349,7 @@ class GraphStageDocSpec extends AkkaSpec {
 
     out.expectNext(1)
 
-    switch.success(Unit)
+    switch.success(())
 
     out.expectComplete()
   }