drop scala 2.12 support

.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scalaVersion: ['2.12', '2.13', '3.3']
+        scalaVersion: ['2.13', '3.3']
         javaVersion: [17, 21]
         pekkoVersion: ['default']
     steps:

.github/workflows/unit-tests.yml

@@ -17,7 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { javaVersion: 17,  scalaVersion: 2.12, sbtOpts: '' }
           - { javaVersion: 17,  scalaVersion: 2.13, sbtOpts: '' }
           - { javaVersion: 17,  scalaVersion: 3.3,  sbtOpts: '' }
     steps:

discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsDiscovery.scala

@@ -16,9 +16,10 @@ package org.apache.pekko.discovery.awsapi.ecs
 import java.net.{ InetAddress, NetworkInterface }
 
 import org.apache.pekko
-import pekko.util.ccompat.JavaConverters._
 import pekko.annotation.ApiMayChange
 
+import scala.jdk.CollectionConverters._
+
 @ApiMayChange
 object AsyncEcsDiscovery {
 

discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsServiceDiscovery.scala

@@ -15,19 +15,21 @@ package org.apache.pekko.discovery.awsapi.ecs
 
 import java.net.InetAddress
 import java.util.concurrent.TimeoutException
+
 import scala.collection.immutable.Seq
 import scala.concurrent.duration._
 import scala.concurrent.{ ExecutionContext, Future }
+import scala.jdk.CollectionConverters._
+import scala.jdk.FutureConverters._
 import scala.util.Try
+
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.annotation.ApiMayChange
 import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
 import pekko.discovery.awsapi.ecs.AsyncEcsServiceDiscovery.{ resolveTasks, Tag }
 import pekko.discovery.{ Lookup, ServiceDiscovery }
 import pekko.pattern.after
-import pekko.util.FutureConverters._
-import pekko.util.ccompat.JavaConverters._
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient
 import software.amazon.awssdk.retries.DefaultRetryStrategy

discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala

@@ -15,10 +15,14 @@ package org.apache.pekko.discovery.awsapi.ecs
 
 import java.net.InetAddress
 import java.util.concurrent.TimeoutException
+
 import scala.collection.immutable.Seq
 import scala.concurrent.duration._
 import scala.concurrent.{ ExecutionContext, Future }
+import scala.jdk.CollectionConverters._
+import scala.jdk.FutureConverters._
 import scala.util.Try
+
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.annotation.ApiMayChange
@@ -31,8 +35,6 @@ import pekko.http.scaladsl.unmarshalling.Unmarshal
 import pekko.http.scaladsl.{ Http, HttpExt }
 import pekko.pattern.after
 import pekko.stream.Materializer
-import pekko.util.FutureConverters._
-import pekko.util.ccompat.JavaConverters._
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
 import software.amazon.awssdk.retries.DefaultRetryStrategy
 import software.amazon.awssdk.services.ecs._

discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ec2/Ec2TagBasedServiceDiscovery.scala

@@ -26,14 +26,14 @@ import pekko.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery.parseFiltersString
 import pekko.discovery.{ Lookup, ServiceDiscovery }
 import pekko.event.Logging
 import pekko.pattern.after
-import pekko.util.ccompat.JavaConverters._
 
 import java.net.InetAddress
 import java.util.concurrent.TimeoutException
 import scala.annotation.tailrec
 import scala.collection.immutable.Seq
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ ExecutionContext, Future }
+import scala.jdk.CollectionConverters._
 import scala.util.{ Failure, Success, Try }
 
 /** INTERNAL API */

discovery-aws-api/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/EcsServiceDiscovery.scala

@@ -15,13 +15,13 @@ package org.apache.pekko.discovery.awsapi.ecs
 
 import java.net.{ InetAddress, NetworkInterface }
 import java.util.concurrent.TimeoutException
+
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.discovery.{ Lookup, ServiceDiscovery }
 import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
 import pekko.discovery.awsapi.ecs.EcsServiceDiscovery.resolveTasks
 import pekko.pattern.after
-import pekko.util.ccompat.JavaConverters._
 
 import com.amazonaws.ClientConfiguration
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration
@@ -33,6 +33,7 @@ import scala.annotation.tailrec
 import scala.collection.immutable.Seq
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.concurrent.duration._
+import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 final class EcsServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {

discovery-aws-api/src/test/scala/org/apache/pekko/discovery/awsapi/ec2/FiltersParsingTest.scala

@@ -16,10 +16,11 @@ package org.apache.pekko.discovery.awsapi.ec2
 import com.amazonaws.services.ec2.model.Filter
 import org.apache.pekko
 import pekko.discovery.awsapi.ec2.Ec2TagBasedServiceDiscovery.parseFiltersString
-import pekko.util.ccompat.JavaConverters._
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 
+import scala.jdk.CollectionConverters._
+
 class FiltersParsingTest extends AnyFunSuite with Matchers {
 
   test("empty string does not break parsing") {

discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulServiceDiscovery.scala

@@ -26,14 +26,14 @@ import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
 import pekko.discovery.consul.ConsulServiceDiscovery._
 import pekko.discovery.{ Lookup, ServiceDiscovery }
 import pekko.pattern.after
-import pekko.util.ccompat.JavaConverters._
 
 import java.net.InetAddress
 import java.util
 import java.util.concurrent.TimeoutException
 import scala.collection.immutable.Seq
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ ExecutionContext, Future, Promise }
+import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 @ApiMayChange

discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/Settings.scala

@@ -18,7 +18,7 @@ import java.util.Optional
 import org.apache.pekko.actor._
 import com.typesafe.config.Config
 
-import org.apache.pekko.util.OptionConverters._
+import scala.jdk.OptionConverters._
 
 final class Settings(kubernetesApi: Config) extends Extension {
 

integration-test/aws-api-ec2/src/test/scala/org/apache/pekko/cluster/bootstrap/IntegrationTest.scala

@@ -23,7 +23,6 @@ import pekko.http.scaladsl.Http
 import pekko.http.scaladsl.model.HttpRequest
 import pekko.management.cluster.{ ClusterHttpManagementJsonProtocol, ClusterMembers }
 import pekko.util.ByteString
-import pekko.util.ccompat.JavaConverters._
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.PatienceConfiguration.{ Interval, Timeout }
 import org.scalatest.concurrent.{ Eventually, ScalaFutures }
@@ -33,6 +32,7 @@ import org.scalatest.time.{ Seconds, Span, SpanSugar }
 import spray.json._
 
 import scala.concurrent.{ Await, Future }
+import scala.jdk.CollectionConverters._
 import scala.language.postfixOps
 
 trait HttpClient {

lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettings.scala

@@ -17,10 +17,10 @@ import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.annotation.InternalApi
 import pekko.coordination.lease.TimeoutSettings
-import pekko.util.JavaDurationConverters._
 import com.typesafe.config.Config
 
 import scala.concurrent.duration.{ FiniteDuration, _ }
+import scala.jdk.DurationConverters._
 
 /**
  * INTERNAL API
@@ -45,7 +45,7 @@ private[pekko] object KubernetesSettings {
 
     val apiServerRequestTimeout =
       if (config.hasDefined("api-server-request-timeout"))
-        config.getDuration("api-server-request-timeout").asScala
+        config.getDuration("api-server-request-timeout").toScala
       else
         leaseTimeoutSettings.operationTimeout * 2 / 5 // 2/5 gives two API operations + a buffer
 

management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapSettings.scala

@@ -21,9 +21,10 @@ import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.event.LoggingAdapter
 import com.typesafe.config.Config
+
 import scala.concurrent.duration.{ FiniteDuration, _ }
-import pekko.util.JavaDurationConverters._
-import pekko.util.OptionConverters._
+import scala.jdk.DurationConverters._
+import scala.jdk.OptionConverters._
 
 final class ClusterBootstrapSettings(config: Config, log: LoggingAdapter) {
   import pekko.management.PekkoManagementSettings._
@@ -112,24 +113,24 @@ final class ClusterBootstrapSettings(config: Config, log: LoggingAdapter) {
   def getContactPointDiscoveryMethod: String = contactPointDiscovery.discoveryMethod
 
   /** Java API */
-  def getContactPointDiscoveryStableMargin: java.time.Duration = contactPointDiscovery.stableMargin.asJava
+  def getContactPointDiscoveryStableMargin: java.time.Duration = contactPointDiscovery.stableMargin.toJava
 
   /** Java API */
-  def getContactPointDiscoveryInterval: java.time.Duration = contactPointDiscovery.interval.asJava
+  def getContactPointDiscoveryInterval: java.time.Duration = contactPointDiscovery.interval.toJava
 
   /** Java API */
   def getContactPointDiscoveryExponentialBackoffRandomFactor: Double =
     contactPointDiscovery.exponentialBackoffRandomFactor
 
   /** Java API */
   def getContactPointDiscoveryExponentialBackoffMax: java.time.Duration =
-    contactPointDiscovery.exponentialBackoffMax.asJava
+    contactPointDiscovery.exponentialBackoffMax.toJava
 
   /** Java API */
   def getContactPointDiscoveryRequiredContactPointsNr: Int = contactPointDiscovery.requiredContactPointsNr
 
   /** Java API */
-  def getContactPointDiscoveryResolveTimeout: java.time.Duration = contactPointDiscovery.resolveTimeout.asJava
+  def getContactPointDiscoveryResolveTimeout: java.time.Duration = contactPointDiscovery.resolveTimeout.toJava
 
   object contactPoint {
     private val contactPointConfig = bootConfig.getConfig("contact-point")
@@ -159,7 +160,7 @@ final class ClusterBootstrapSettings(config: Config, log: LoggingAdapter) {
   def getContactPointFallbackPort: Int = contactPoint.fallbackPort
 
   /** Java API */
-  def getContactPointProbingFailureTimeout: java.time.Duration = contactPoint.probingFailureTimeout.asJava
+  def getContactPointProbingFailureTimeout: java.time.Duration = contactPoint.probingFailureTimeout.toJava
 
   object joinDecider {
     val implClass: String = bootConfig.getString("join-decider.class")

management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/JoinDecider.scala

@@ -14,11 +14,13 @@
 package org.apache.pekko.management.cluster.bootstrap
 
 import java.time.LocalDateTime
+
 import scala.concurrent.Future
+import scala.jdk.CollectionConverters._
+
 import org.apache.pekko
 import pekko.actor.Address
 import pekko.discovery.ServiceDiscovery.ResolvedTarget
-import pekko.util.ccompat.JavaConverters._
 
 /**
  * The decisions of joining existing seed-nodes or join self to form new

management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/javadsl/ClusterMembershipCheck.scala

@@ -19,7 +19,8 @@ import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.dispatch.ExecutionContexts
 import pekko.management.cluster.scaladsl.{ ClusterMembershipCheck => ScalaClusterReadinessCheck }
-import pekko.util.FutureConverters._
+
+import scala.jdk.FutureConverters._
 
 class ClusterMembershipCheck(system: ActorSystem)
     extends java.util.function.Supplier[CompletionStage[java.lang.Boolean]] {

management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterMembershipCheck.scala

@@ -18,11 +18,11 @@ import pekko.actor.ActorSystem
 import pekko.annotation.InternalApi
 import pekko.cluster.{ Cluster, MemberStatus }
 import pekko.util.Helpers
-import pekko.util.ccompat.JavaConverters._
 
 import com.typesafe.config.Config
 
 import scala.concurrent.Future
+import scala.jdk.CollectionConverters._
 
 /**
  * Internal API

management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala

@@ -18,13 +18,14 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.security.{ KeyStore, PrivateKey }
 import java.security.cert.{ Certificate, CertificateFactory }
+
 import scala.concurrent.blocking
+import scala.jdk.CollectionConverters._
 import scala.util.Random
 
 import org.apache.pekko
 import pekko.annotation.InternalApi
 import pekko.pki.pem.{ DERPrivateKeyLoader, PEMDecoder }
-import pekko.util.ccompat.JavaConverters._
 
 import javax.net.ssl.{ TrustManager, TrustManagerFactory }
 

management/src/main/scala/org/apache/pekko/management/HealthCheckSettings.scala

@@ -14,12 +14,11 @@
 package org.apache.pekko.management
 
 import com.typesafe.config.Config
-import org.apache.pekko
-import pekko.util.JavaDurationConverters._
-import pekko.util.ccompat.JavaConverters._
 
 import scala.collection.immutable
 import scala.concurrent.duration.FiniteDuration
+import scala.jdk.CollectionConverters._
+import scala.jdk.DurationConverters._
 
 final case class NamedHealthCheck(name: String, fullyQualifiedClassName: String)
 
@@ -62,7 +61,7 @@ object HealthCheckSettings {
       config.getString("startup-path"),
       config.getString("readiness-path"),
       config.getString("liveness-path"),
-      config.getDuration("check-timeout").asScala)
+      config.getDuration("check-timeout").toScala)
   }
 
   /**
@@ -88,7 +87,7 @@ object HealthCheckSettings {
       startupPath,
       readinessPath,
       livenessPath,
-      checkDuration.asScala)
+      checkDuration.toScala)
 
   /**
    * Java API
@@ -107,7 +106,7 @@ object HealthCheckSettings {
       "",
       readinessPath,
       livenessPath,
-      checkDuration.asScala)
+      checkDuration.toScala)
 }
 
 /**
@@ -165,5 +164,5 @@ final class HealthCheckSettings(
   /**
    * Java API
    */
-  def getCheckTimeout(): java.time.Duration = checkTimeout.asJava
+  def getCheckTimeout(): java.time.Duration = checkTimeout.toJava
 }

management/src/main/scala/org/apache/pekko/management/PekkoManagementSettings.scala

@@ -17,11 +17,12 @@ import java.net.InetAddress
 import java.util.Optional
 
 import scala.collection.immutable
+import scala.jdk.CollectionConverters._
+import scala.jdk.OptionConverters._
 
 import org.apache.pekko
 import pekko.annotation.InternalApi
-import pekko.util.OptionConverters._
-import pekko.util.ccompat.JavaConverters._
+
 import com.typesafe.config.Config
 
 final class PekkoManagementSettings(val config: Config) {

management/src/main/scala/org/apache/pekko/management/internal/HealthChecksImpl.scala

@@ -17,6 +17,7 @@ import java.util.concurrent.CompletionStage
 import java.util.function.Supplier
 import java.util.{ List => JList }
 import java.lang.{ Boolean => JBoolean }
+
 import org.apache.pekko
 import pekko.actor.{ ActorSystem, ExtendedActorSystem }
 import pekko.annotation.InternalApi
@@ -26,11 +27,11 @@ import pekko.management.javadsl.{ LivenessCheckSetup => JLivenessCheckSetup }
 import pekko.management.javadsl.{ ReadinessCheckSetup => JReadinessCheckSetup }
 import pekko.management.javadsl.{ StartupCheckSetup => JStartupCheckSetup }
 import pekko.management.scaladsl.{ HealthChecks, LivenessCheckSetup, ReadinessCheckSetup, StartupCheckSetup }
-import pekko.util.FutureConverters._
-import pekko.util.ccompat.JavaConverters._
 
 import scala.collection.immutable
 import scala.concurrent.Future
+import scala.jdk.CollectionConverters._
+import scala.jdk.FutureConverters._
 import scala.util.{ Failure, Success, Try }
 
 final case class CheckFailedException(msg: String, cause: Throwable) extends RuntimeException(msg, cause)