Update scalafmt-core to 2.7.5

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "2.4.2"
+version = "2.7.5"
 maxColumn = 120
 align = most
 continuationIndent.defnSite = 2

akka-http/src/test/scala/io/scalac/periscope/akka/http/DeadLettersMonitorRouteSpec.scala

@@ -126,7 +126,9 @@ class DeadLettersMonitorRouteSpec
         val json = parse(responseAs[String]).getOrElse(fail("Invalid json"))
 
         val unhandled = json.hcursor.downField("snapshot").downField("unhandled")
-        unhandled.downArray.downField("value").downField("message").as[String] shouldBe Right("UnknownMessage(\"this\\\"is a \"\\\" tough message)")
+        unhandled.downArray.downField("value").downField("message").as[String] shouldBe Right(
+          "UnknownMessage(\"this\\\"is a \"\\\" tough message)"
+        )
       }
     )
   }

build.sbt

@@ -96,8 +96,8 @@ val core = (project in file("core"))
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-actor"   % akkaVersion,
       "org.scalatest"     %% "scalatest"    % scalaTestVersion % Test,
-      "io.circe"          %% "circe-parser" % circeVersion % Test,
-      "com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test
+      "io.circe"          %% "circe-parser" % circeVersion     % Test,
+      "com.typesafe.akka" %% "akka-testkit" % akkaVersion      % Test
     )
   )
   .settings(publishSettings: _*)
@@ -110,16 +110,16 @@ val akkaHttp = (project in file("akka-http"))
       "com.typesafe.akka" %% "akka-actor"          % akkaVersion,
       "com.typesafe.akka" %% "akka-http"           % akkaHttpVersion,
       "org.scalatest"     %% "scalatest"           % scalaTestVersion % Test,
-      "io.circe"          %% "circe-parser"        % circeVersion % Test,
-      "com.typesafe.akka" %% "akka-testkit"        % akkaVersion % Test,
-      "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
-      "com.typesafe.akka" %% "akka-http-testkit"   % akkaHttpVersion % Test
+      "io.circe"          %% "circe-parser"        % circeVersion     % Test,
+      "com.typesafe.akka" %% "akka-testkit"        % akkaVersion      % Test,
+      "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion      % Test,
+      "com.typesafe.akka" %% "akka-http-testkit"   % akkaHttpVersion  % Test
     )
   )
   .settings(publishSettings: _*)
   .dependsOn(core % "compile->compile;test->test")
 
-val root = (project in file("."))
+val root     = (project in file("."))
   .settings(buildSettings: _*)
   .settings(publishSettings: _*)
   .settings(noPublishSettings: _*)

core/src/main/scala-2.12/io/scalac/periscope/akka/deadletters/DeadLettersDataCollector.scala

@@ -5,13 +5,13 @@ import io.scalac.periscope.common.{ ArrayDeque, Deque }
 
 private[deadletters] class DeadLettersDataCollector(keepMax: Int) extends AbstractDeadLettersDataCollector(keepMax) {
 
-  override protected val lastDeadLetters: Deque[Timestamped[DeadLetter]] = ArrayDeque(
+  override protected val lastDeadLetters: Deque[Timestamped[DeadLetter]]     = ArrayDeque(
     new scala.collection.mutable.ArrayBuffer(keepMax)
   )
   override protected val lastUnhandled: Deque[Timestamped[UnhandledMessage]] = ArrayDeque(
     new scala.collection.mutable.ArrayBuffer(keepMax)
   )
-  override protected val lastDropped: Deque[Timestamped[Dropped]] = ArrayDeque(
+  override protected val lastDropped: Deque[Timestamped[Dropped]]            = ArrayDeque(
     new scala.collection.mutable.ArrayBuffer(keepMax)
   )
 }

core/src/main/scala-2.13/io/scalac/periscope/akka/deadletters/DeadLettersDataCollector.scala

@@ -5,13 +5,13 @@ import io.scalac.periscope.common.{ ArrayDeque, Deque }
 
 private[deadletters] class DeadLettersDataCollector(keepMax: Int) extends AbstractDeadLettersDataCollector(keepMax) {
 
-  override protected val lastDeadLetters: Deque[Timestamped[DeadLetter]] = ArrayDeque(
+  override protected val lastDeadLetters: Deque[Timestamped[DeadLetter]]     = ArrayDeque(
     new scala.collection.mutable.ArrayDeque(keepMax)
   )
   override protected val lastUnhandled: Deque[Timestamped[UnhandledMessage]] = ArrayDeque(
     new scala.collection.mutable.ArrayDeque(keepMax)
   )
-  override protected val lastDropped: Deque[Timestamped[Dropped]] = ArrayDeque(
+  override protected val lastDropped: Deque[Timestamped[Dropped]]            = ArrayDeque(
     new scala.collection.mutable.ArrayDeque(keepMax)
   )
 }

core/src/main/scala/io/scalac/periscope/akka/counter/package.scala

@@ -14,12 +14,12 @@ package object counter {
 
   def count(system: ActorSystem)(implicit ec: ExecutionContext, timeout: Timeout): Future[Long] = {
     val correlation = Instant.now().toEpochMilli
-    val counter = system.actorOf(
+    val counter     = system.actorOf(
       Props(new ActorCounter(correlation)),
       s"actor-counter-$correlation"
     )
     counter ! Count
-    val result = after(timeout.duration, system.scheduler)((counter ? GetResult).mapTo[Long])
+    val result      = after(timeout.duration, system.scheduler)((counter ? GetResult).mapTo[Long])
     result.onComplete(_ => system.stop(counter))
     result
   }

core/src/main/scala/io/scalac/periscope/akka/deadletters/DeadLettersMonitor.scala

@@ -14,8 +14,8 @@ trait DeadLettersMonitor {
 }
 
 object DeadLettersMonitor {
-  def start(keepMax: Int, name: String = "DeadLettersMonitor")(
-    implicit system: ActorSystem,
+  def start(keepMax: Int, name: String = "DeadLettersMonitor")(implicit
+    system: ActorSystem,
     timeout: Timeout
   ): DeadLettersMonitor = {
     val collector = system.actorOf(Props(new DeadLettersDataCollector(keepMax)), name)

core/src/main/scala/io/scalac/periscope/akka/deadletters/Snapshot.scala

@@ -23,11 +23,9 @@ object Snapshot {
   private def vectorToJson[A](v: Vector[Timestamped[A]], atoj: A => String) =
     if (v.isEmpty) "[]"
     else
-      v.foldLeft("[") {
-          case (agg, i) =>
-            s"""$agg{"timestamp":${i.timestamp},"value":${atoj(i.value)}},"""
-        }
-        .init + "]"
+      v.foldLeft("[") { case (agg, i) =>
+        s"""$agg{"timestamp":${i.timestamp},"value":${atoj(i.value)}},"""
+      }.init + "]"
 
   private def deadLetterToJson(a: DeadLetter) =
     s"""{"message":"${json.escape(a.message.toString)}","sender":"${a.sender.toString()}","recipient":"${a.recipient

core/src/main/scala/io/scalac/periscope/akka/deadletters/WindowSnapshot.scala

@@ -5,8 +5,9 @@ final case class WindowSnapshot(
   deadLetters: WindowData,
   unhandled: WindowData,
   dropped: WindowData
-){
-  def toJson = s"""{"withinMillis":$withinMillis,"deadLetters":${deadLetters.toJson},"unhandled":${unhandled.toJson},"dropped":${dropped.toJson}}"""
+) {
+  def toJson =
+    s"""{"withinMillis":$withinMillis,"deadLetters":${deadLetters.toJson},"unhandled":${unhandled.toJson},"dropped":${dropped.toJson}}"""
 }
 
 final case class WindowData(count: Int, isMinimumEstimate: Boolean) {

core/src/main/scala/io/scalac/periscope/akka/tree/ActorTree.scala

@@ -21,9 +21,8 @@ final case class ActorTree(nodes: Map[String, ActorTree]) extends AnyVal {
     if (nodes.isEmpty) "{}"
     else
       nodes
-        .foldLeft("{") {
-          case (agg, (actor, children)) =>
-            s"""$agg"$actor":${children.asJson},"""
+        .foldLeft("{") { case (agg, (actor, children)) =>
+          s"""$agg"$actor":${children.asJson},"""
         }
         .init + "}"
 }

core/src/main/scala/io/scalac/periscope/akka/tree/MutableActorTree.scala

@@ -6,9 +6,8 @@ import scala.collection.mutable
 
 private[tree] final class MutableActorTree(val nodes: mutable.Map[String, MutableActorTree]) extends AnyVal {
   def insert(p: ActorPath): MutableActorTree =
-    p.elements.foldLeft(this) {
-      case (n, segment) =>
-        n.nodes.getOrElseUpdate(segment, new MutableActorTree(mutable.Map.empty))
+    p.elements.foldLeft(this) { case (n, segment) =>
+      n.nodes.getOrElseUpdate(segment, new MutableActorTree(mutable.Map.empty))
     }
 
   def toActorTree: ActorTree = ActorTree(nodes.map { case (k, v) => k -> v.toActorTree }.toMap)

core/src/main/scala/io/scalac/periscope/akka/tree/package.scala

@@ -14,12 +14,12 @@ package object tree {
 
   def build(system: ActorSystem)(implicit ec: ExecutionContext, timeout: Timeout): Future[ActorTree] = {
     val correlation = Instant.now().toEpochMilli
-    val builder = system.actorOf(
+    val builder     = system.actorOf(
       Props(new ActorTreeBuilder(correlation)),
       s"actor-tree-builder-$correlation"
     )
     builder ! Build
-    val result = after(timeout.duration, system.scheduler)((builder ? GetTree).mapTo[ActorTree])
+    val result      = after(timeout.duration, system.scheduler)((builder ? GetTree).mapTo[ActorTree])
     result.onComplete(_ => system.stop(builder))
     result
   }

core/src/main/scala/io/scalac/periscope/common/Deque.scala

@@ -1,8 +1,8 @@
 package io.scalac.periscope.common
 
 /**
-Cross-compilation helper, abstracting over a specific queue implementation.
-Allows to use a more performant ArrayDeque in Scala 2.13.
+ * Cross-compilation helper, abstracting over a specific queue implementation.
+ * Allows to use a more performant ArrayDeque in Scala 2.13.
  */
 trait Deque[A] {
   def toVector: Vector[A]

core/src/test/scala/io/scalac/periscope/akka/actors.scala

@@ -3,8 +3,8 @@ package io.scalac.periscope.akka
 import akka.actor.{ Actor, Props }
 
 class ActorA extends Actor {
-  def receive: Receive = {
-    case _: KnownMessage => ()
+  def receive: Receive = { case _: KnownMessage =>
+    ()
   }
   override def preStart(): Unit = {
     context.actorOf(Props(new ActorB), name = "ab")
@@ -38,8 +38,8 @@ class OverwhelmedActorParent extends Actor {
 }
 
 class OverwhelmedActor extends Actor {
-  def receive: Receive = {
-    case () => Thread.sleep(5000)
+  def receive: Receive          = { case () =>
+    Thread.sleep(5000)
   }
   override def preStart(): Unit =
     self.!(())

core/src/test/scala/io/scalac/periscope/akka/deadletters/DeadLettersDataCollectorSpec.scala

@@ -69,12 +69,11 @@ class DeadLettersDataCollectorSpec
     eventually {
       val window   = (collector ? CalculateForWindow(withinTime.toMillis * 2)).mapTo[WindowSnapshot].futureValue
       val snapshot = (collector ? GetSnapshot).mapTo[Snapshot].futureValue
-      inside(snapshot.unhandled) {
-        case Vector(m1, m2, m3) =>
-          // reverse order - latest first
-          m1.value.message shouldBe UnknownMessage("Luke, I'm your father!")
-          m2.value.message shouldBe UnknownMessage("Something is wrong")
-          m3.value.message shouldBe UnknownMessage("am I?")
+      inside(snapshot.unhandled) { case Vector(m1, m2, m3) =>
+        // reverse order - latest first
+        m1.value.message shouldBe UnknownMessage("Luke, I'm your father!")
+        m2.value.message shouldBe UnknownMessage("Something is wrong")
+        m3.value.message shouldBe UnknownMessage("am I?")
       }
       snapshot.deadLetters should be(empty)
       snapshot.dropped should be(empty)
@@ -170,8 +169,7 @@ class DeadLettersDataCollectorSpec
 }
 
 class BoundedActor extends Actor with RequiresMessageQueue[BoundedMessageQueueSemantics] {
-  def receive: Receive = {
-    case _ =>
-      Thread.sleep(3000)
+  def receive: Receive = { case _ =>
+    Thread.sleep(3000)
   }
 }

core/src/test/scala/io/scalac/periscope/akka/tree/ActorTreeSpec.scala

@@ -9,7 +9,7 @@ class ActorTreeSpec extends AnyFlatSpec with Matchers {
 
     val tree = ActorTree(
       Map(
-        "user" -> ActorTree(Map("a" -> ActorTree(Map("b" -> ActorTree(Map("c" -> ActorTree(Map.empty))))))),
+        "user"   -> ActorTree(Map("a" -> ActorTree(Map("b" -> ActorTree(Map("c" -> ActorTree(Map.empty))))))),
         "system" -> ActorTree(
           Map(
             "a" -> ActorTree(Map()),

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.3.2")
+addSbtPlugin("com.github.gseitz" % "sbt-release"  % "1.0.13")
+addSbtPlugin("com.typesafe.sbt"  % "sbt-git"      % "1.0.0")
+addSbtPlugin("org.xerial.sbt"    % "sbt-sonatype" % "3.9.2")
+addSbtPlugin("com.jsuereth"      % "sbt-pgp"      % "2.0.1")