From 9ff0ccdc6265aad643e0ab136da457e52c4c82ca Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 11 Aug 2024 17:52:33 +0100 Subject: [PATCH] scalafmt --- .../src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt | 2 +- .../gen-scala-server/07-gen-basic-server-with-pekko/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt index d87c4449..f3ddb3c7 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/01-gen-basic-server/build.sbt @@ -17,7 +17,7 @@ enablePlugins(PekkoGrpcPlugin) assembly / assemblyMergeStrategy := { // https://github.com/akka/akka/issues/29456 - case PathList("google", "protobuf", _*) => MergeStrategy.discard + case PathList("google", "protobuf", _*) => MergeStrategy.discard case PathList("META-INF", "versions", _*) => MergeStrategy.discard case x => val oldStrategy = (assembly / assemblyMergeStrategy).value diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt index 1fa34e50..59b4d211 100644 --- a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt +++ b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-pekko/build.sbt @@ -15,7 +15,7 @@ enablePlugins(PekkoGrpcPlugin) assembly / assemblyMergeStrategy := { // https://github.com/akka/akka/issues/29456 - case PathList("google", "protobuf", _*) => MergeStrategy.discard + case PathList("google", "protobuf", _*) => MergeStrategy.discard case PathList("META-INF", "versions", _*) => MergeStrategy.discard case x => val oldStrategy = (assembly / assemblyMergeStrategy).value