Scala 2.13.0 rc2 (#26967)

This commit is contained in:
Arnout Engelen 2019-05-24 08:11:50 +02:00 committed by Patrik Nordwall
parent 24a3bba135
commit 814cfa286c
168 changed files with 396 additions and 315 deletions

View file

@ -241,7 +241,7 @@ object MultiNodeSpec {
""")
private def mapToConfig(map: Map[String, Any]): Config = {
import scala.collection.JavaConverters._
import akka.util.ccompat.JavaConverters._
ConfigFactory.parseMap(map.asJava)
}
@ -467,7 +467,7 @@ abstract class MultiNodeSpec(
base.replace(tag, replaceWith)
}
}
import scala.collection.JavaConverters._
import akka.util.ccompat.JavaConverters._
ConfigFactory.parseString(deployString).root.asScala.foreach {
case (key, value: ConfigObject) => deployer.parseConfig(key, value.toConfig).foreach(deployer.deploy)
case (key, x) =>