Scala 2.13 cross build take 2

akka-statsd-core/src/main/scala/Config.scala

@@ -35,7 +35,7 @@ object Config {
         FiniteDuration(cfg.getDuration("transmit-interval", java.util.concurrent.TimeUnit.MILLISECONDS), MILLISECONDS),
       enableMultiMetric = cfg.getBoolean("enable-multi-metric"),
       emptyQueueOnFlush = cfg.getBoolean("empty-queue-on-flush"),
-      transformations = cfg.getConfigList("transformations").asScala.map(transformation),
+      transformations = cfg.getConfigList("transformations").asScala.toSeq.map(transformation),
       transformUuid = cfg.getBoolean("transform-uuid"),
       connectedUdp = cfg.getBoolean("connected-udp")
     )

akka-statsd-core/src/main/scala/transport/MultiMetricQueue.scala

@@ -88,7 +88,7 @@ private[statsd] class MultiMetricQueue(val packetSize: Int)(implicit system: Act
   def flushQueue(): Stream[String] = Stream.continually(payload()).takeWhile(_.nonEmpty).flatten
 
   private object DroppedMessageWarning extends ((Int, String) => Unit) {
-    def apply(proposedAddition: Int, message: String) {
+    def apply(proposedAddition: Int, message: String): Unit = {
       if (!logger.isWarningEnabled)
         return
 

akka-statsd-core/src/main/scala/transport/ScheduledDispatcher.scala

@@ -48,7 +48,7 @@ private[statsd] class ScheduledDispatcher(
       else mmq.payload().foreach(connection ! _)
   }
 
-  override def postStop() {
+  override def postStop(): Unit = {
     val _ = recurringTransmit.cancel()
   }
 

akka-statsd-core/src/main/scala/transport/UdpUnconnected.scala

@@ -17,7 +17,7 @@ private[statsd] class UdpUnconnected(remoteAddress: InetSocketAddress) extends A
   def receive: Receive = waitingForConnection
 
   def waitingForConnection: Receive = {
-    case Udp.SimpleSenderReady ⇒
+    case Udp.SimpleSenderReady =>
       unstashAll()
       context become operational(sender())
     case _: String =>

akka-statsd-core/src/test/scala/StatsSpec.scala

@@ -95,7 +95,7 @@ class StatsSpec
       .copy(address = boundListenerAddress())
     val statsProps = Stats.props(baseConfig)
 
-    def shutdown() {
+    def shutdown(): Unit = {
       listener ! Udp.Unbind
     }
   }

akka-statsd-core/src/test/scala/TestKit.scala

@@ -9,7 +9,7 @@ trait BeforeAndAfterAllTestKit
 
   implicit def system: ActorSystem
 
-  override protected def afterAll() {
+  override protected def afterAll(): Unit = {
     akka.testkit.TestKit.shutdownActorSystem(system)
   }
 

akka-statsd-http-server/src/main/scala/StatsDirectives.scala

@@ -79,7 +79,7 @@ trait StatsDirectives extends AroundDirectives with BasicDirectives {
 
   def countRequestInBucket(baseBucket: String): Directive0 = {
     extractStats.flatMap { stats =>
-      Directive { innerRouteBuilder ⇒ ctx ⇒
+      Directive { innerRouteBuilder => ctx =>
         val req = ctx.request
         stats ! Increment(requestBucket(req.method, req.uri.path, baseBucket))
         innerRouteBuilder(())(ctx)
@@ -94,7 +94,7 @@ trait StatsDirectives extends AroundDirectives with BasicDirectives {
 
   def countResponseInBucket(baseBucket: String): Directive0 = {
     extractStats.flatMap { stats =>
-      Directive { innerRouteBuilder ⇒ ctx ⇒
+      Directive { innerRouteBuilder => ctx =>
         import ctx.executionContext
 
         val req = ctx.request

build.sbt

@@ -1,13 +1,14 @@
-import com.typesafe.sbt.pgp.PgpKeys
 import ReleaseTransformations._
+import tnm.ScalaVersion
 
 val commonSettings = Seq(
   organization := "com.newmotion",
   licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
   homepage := Some(url("https://github.com/NewMotion/akka-statsd")),
+  crossScalaVersions := Seq(ScalaVersion.curr, ScalaVersion.prev, ScalaVersion.aged),
   libraryDependencies ++= Seq(
     akka("testkit"),
-    "org.scalatest" %% "scalatest" % "3.0.5"
+    "org.scalatest" %% "scalatest" % "3.0.8"
   ).map(_ % "test"),
   releasePublishArtifactsAction := PgpKeys.publishSigned.value,
   releaseProcess := Seq[ReleaseStep](
@@ -76,8 +77,8 @@ val `akka-statsd` =
 
 def akka(lib: String) = {
   val version = lib match {
-    case x if x.startsWith("http") => "10.1.5"
-    case _ => "2.5.18"
+    case x if x.startsWith("http") => "10.1.10"
+    case _ => "2.5.25"
   }
 
   "com.typesafe.akka" %% s"akka-$lib" % version

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.3.2

project/plugins.sbt

@@ -1,4 +1,4 @@
-resolvers += "TNM" at "http://nexus.thenewmotion.com/content/groups/public"
+resolvers += "TNM" at "https://nexus.thenewmotion.com/content/groups/public"
 
-addSbtPlugin("com.newmotion" % "sbt-build-seed" % "4.1.2")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
+addSbtPlugin("com.newmotion" % "sbt-build-seed" % "5.0.4")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")