From 90e09549e858eaeeae148b3f3d97290b3254646f Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Mon, 17 Aug 2020 10:04:43 +0100 Subject: [PATCH] 2.13 compilation --- .../sharding/typed/ReplicatedShardingSpec.scala | 11 ++++++----- .../persistence/testkit/internal/TestKitStorage.scala | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala index 93b4d6fa8e..51908fe605 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ReplicatedShardingSpec.scala @@ -35,7 +35,8 @@ import akka.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedIntSet import akka.cluster.sharding.typed.ReplicatedShardingSpec.MyReplicatedStringSet import akka.persistence.typed.ReplicationId import com.typesafe.config.Config - +import akka.util.ccompat._ +@ccompatUsedUntil213 object ReplicatedShardingSpec { def commonConfig = ConfigFactory.parseString(""" akka.loglevel = INFO @@ -247,12 +248,12 @@ abstract class ReplicatedShardingSpec(replicationType: ReplicationType, configA: Cluster(system2).manager ! Join(Cluster(system).selfMember.address) eventually { - Cluster(system).state.members.size should ===(2) - Cluster(system).state.members.map(_.status) should ===(Set[MemberStatus](MemberStatus.Up)) + Cluster(system).state.members.unsorted.size should ===(2) + Cluster(system).state.members.unsorted.map(_.status) should ===(Set[MemberStatus](MemberStatus.Up)) } eventually { - Cluster(system2).state.members.size should ===(2) - Cluster(system2).state.members.map(_.status) should ===(Set[MemberStatus](MemberStatus.Up)) + Cluster(system2).state.members.unsorted.size should ===(2) + Cluster(system2).state.members.unsorted.map(_.status) should ===(Set[MemberStatus](MemberStatus.Up)) } } diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala index 47c6ddc7fb..a4ea67c145 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicReference import scala.collection.immutable -import scala.collection.JavaConverters._ +import akka.util.ccompat.JavaConverters._ import akka.annotation.InternalApi import akka.persistence.testkit.ProcessingPolicy