Merge pull request #456 from akka/scala-2.13.0-M5

Scala 2.13.0-M5 support

Author: patriknw

cluster-bootstrap/src/main/scala/akka/management/cluster/bootstrap/contactpoint/HttpBootstrapJsonProtocol.scala

@@ -30,6 +30,7 @@ object HttpBootstrapJsonProtocol extends DefaultJsonProtocol {
 
   // we use Address since we want to know which protocol is being used (tcp, artery, artery-tcp etc)
   final case class ClusterMember(node: Address, nodeUid: Long, status: String, roles: Set[String])
+  implicit val clusterMemberOrdering: Ordering[ClusterMember] = Ordering.by(_.node)
 
   final case class SeedNodes(selfNode: Address, seedNodes: Set[ClusterMember])
 

cluster-http/src/main/scala/akka/management/cluster/ClusterHttpManagementProtocol.scala

@@ -13,6 +13,9 @@ import spray.json.RootJsonFormat
 
 final case class ClusterUnreachableMember(node: String, observedBy: immutable.Seq[String])
 final case class ClusterMember(node: String, nodeUid: String, status: String, roles: Set[String])
+object ClusterMember {
+  implicit val clusterMemberOrdering: Ordering[ClusterMember] = Ordering.by(_.node)
+}
 final case class ClusterMembers(selfNode: String,
                                 members: Set[ClusterMember],
                                 unreachable: immutable.Seq[ClusterUnreachableMember],
@@ -44,7 +47,7 @@ final case class ShardDetails(regions: immutable.Seq[ShardRegionInfo])
 trait ClusterHttpManagementJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol {
   implicit val clusterUnreachableMemberFormat: RootJsonFormat[ClusterUnreachableMember] =
     jsonFormat2(ClusterUnreachableMember)
-  implicit val clusterMemberFormat: RootJsonFormat[ClusterMember] = jsonFormat4(ClusterMember)
+  implicit val clusterMemberFormat: RootJsonFormat[ClusterMember] = jsonFormat4(ClusterMember.apply)
   implicit val clusterMembersFormat: RootJsonFormat[ClusterMembers] = jsonFormat6(ClusterMembers)
   implicit val clusterMemberMessageFormat: RootJsonFormat[ClusterHttpManagementMessage] =
     jsonFormat1(ClusterHttpManagementMessage)

cluster-http/src/test/scala/akka/management/cluster/scaladsl/ClusterMembershipCheckSpec.scala

@@ -4,7 +4,7 @@
 
 package akka.management.cluster.scaladsl
 
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
+import akka.actor.ActorSystem
 import akka.cluster.MemberStatus
 import akka.testkit.TestKit
 import org.scalatest.concurrent.ScalaFutures

discovery-aws-api-async/src/main/scala/akka/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala

@@ -79,8 +79,8 @@ object AsyncEcsServiceDiscovery {
       .flatMap(_.getInetAddresses.asScala)
       .filterNot(_.isLoopbackAddress)
       .filter(_.isSiteLocalAddress)
-      .to[Seq] match {
-      case Seq(value) =>
+      .toList match {
+      case List(value) =>
         Right(value)
 
       case other =>
@@ -140,7 +140,7 @@ object AsyncEcsServiceDiscovery {
             )
         )
       )
-      tasks = describeTasksResponses.flatMap(_.tasks().asScala).to[Seq]
+      tasks = describeTasksResponses.flatMap(_.tasks().asScala).toList
     } yield tasks
 
 }

discovery-aws-api/src/main/scala/akka/discovery/awsapi/ecs/EcsServiceDiscovery.scala

@@ -80,8 +80,8 @@ object EcsServiceDiscovery {
       .flatMap(_.getInetAddresses.asScala)
       .filterNot(_.isLoopbackAddress)
       .filter(_.isSiteLocalAddress)
-      .to[Seq] match {
-      case Seq(value) =>
+      .toList match {
+      case List(value) =>
         Right(value)
 
       case other =>
@@ -125,7 +125,7 @@ object EcsServiceDiscovery {
   private[this] def describeTasks(ecsClient: AmazonECS, cluster: String, taskArns: Seq[String]): Seq[Task] =
     for {
       // Each DescribeTasksRequest can contain at most 100 task ARNs.
-      group <- taskArns.grouped(100).to[Seq]
+      group <- taskArns.grouped(100).toList
       tasks = ecsClient.describeTasks(
         new DescribeTasksRequest().withCluster(cluster).withTasks(group.asJava)
       )

integration-test/aws-api-ec2/build.sbt

@@ -8,6 +8,6 @@ libraryDependencies += "com.amazonaws" % "aws-java-sdk-autoscaling" % "1.11.271"
 
 libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.7" // aws SDK depends on insecure jackson
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % IntegrationTest
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.6-SNAP5" % IntegrationTest
 
 

management/src/main/scala/akka/management/internal/HealthChecksImpl.scala

@@ -85,7 +85,9 @@ final private[akka] class HealthChecksImpl(system: ExtendedActorSystem, settings
       .recoverWith {
         case _: NoSuchMethodException =>
           system.dynamicAccess.createInstanceFor[HealthCheck](fqcn, Nil)
-
+        // Can be removed when 2.13.0-RC1 is out (https://github.com/scala/bug/issues/7390)
+        case o =>
+          Failure(o)
       }
   }
 
@@ -111,6 +113,9 @@ final private[akka] class HealthChecksImpl(system: ExtendedActorSystem, settings
           tryLoadScalaHealthCheck(namedHealthCheck.fullyQualifiedClassName).recoverWith {
             case _: ClassCastException =>
               tryLoadJavaHealthCheck(namedHealthCheck.fullyQualifiedClassName)
+            // Can be removed when 2.13.0-RC1 is out (https://github.com/scala/bug/issues/7390)
+            case o =>
+              Failure(o)
         }
       )
       .map {

project/Common.scala

@@ -22,7 +22,7 @@ object Common extends AutoPlugin {
     licenses := Seq(("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))),
     headerLicense := Some(HeaderLicense.Custom("Copyright (C) 2017-2018 Lightbend Inc. <http://www.lightbend.com>")),
 
-    crossScalaVersions := Seq("2.11.12", "2.12.8"),
+    crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-M5"),
 
     crossVersion := CrossVersion.binary,
 
@@ -32,7 +32,6 @@ object Common extends AutoPlugin {
       "-unchecked",
       "-deprecation",
       "-Xlint",
-      "-Yno-adapted-args",
       "-Ywarn-dead-code",
       "-Xfuture",
       "-target:jvm-1.8"

project/Dependencies.scala

@@ -11,7 +11,7 @@ object Dependencies {
 
   val Common = Seq(
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "3.0.1" % Test// ApacheV2
+      "org.scalatest" %% "scalatest" % "3.0.6-SNAP5" % Test// ApacheV2
     )
   )