From d5fb3d050bce2d07c69053a2f8e64eafc426c5d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:13:04 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.9.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7af3866..452d2e9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.8" +version = "3.9.3" runner.dialect = scala3 From 36961cb4effdf367c0930fa540f01e14711ec84e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:13:06 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.9.3 Executed command: scalafmt --non-interactive --- build.sbt | 20 +++++++++---------- .../gitlabbot/domain/SlackMessage.scala | 2 +- .../server/controllers/JobController.scala | 11 +++++----- .../slack/services/MessageBuilder.scala | 3 +-- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index a2bcb27..9224ed4 100644 --- a/build.sbt +++ b/build.sbt @@ -6,14 +6,14 @@ Global / onChangedBuildSource := ReloadOnSourceChanges lazy val root = (project in file(".")) .settings( - libraryDependencies += "dev.zio" %% "zio" % "2.0.15", - libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.0.15" % Test, - libraryDependencies += "dev.zio" %% "zio-test" % "2.0.15" % Test, - libraryDependencies += "dev.zio" %% "zio-config" % "3.0.7", - libraryDependencies += "dev.zio" %% "zio-config-magnolia" % "3.0.7", - libraryDependencies += "dev.zio" %% "zio-config-typesafe" % "3.0.7", - libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.17", - libraryDependencies += "io.d11" %% "zhttp" % "2.0.0-RC11", - libraryDependencies += "dev.zio" %% "zio-json" % "0.5.0", - libraryDependencies += ("com.evolutiongaming" %% "crypto" % "2.0.1").cross(CrossVersion.for3Use2_13), + libraryDependencies += "dev.zio" %% "zio" % "2.0.15", + libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.0.15" % Test, + libraryDependencies += "dev.zio" %% "zio-test" % "2.0.15" % Test, + libraryDependencies += "dev.zio" %% "zio-config" % "3.0.7", + libraryDependencies += "dev.zio" %% "zio-config-magnolia" % "3.0.7", + libraryDependencies += "dev.zio" %% "zio-config-typesafe" % "3.0.7", + libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.17", + libraryDependencies += "io.d11" %% "zhttp" % "2.0.0-RC11", + libraryDependencies += "dev.zio" %% "zio-json" % "0.5.0", + libraryDependencies += ("com.evolutiongaming" %% "crypto" % "2.0.1").cross(CrossVersion.for3Use2_13), ) diff --git a/src/main/scala/com/github/pizzaeueu/gitlabbot/domain/SlackMessage.scala b/src/main/scala/com/github/pizzaeueu/gitlabbot/domain/SlackMessage.scala index 0a84bbd..383184f 100644 --- a/src/main/scala/com/github/pizzaeueu/gitlabbot/domain/SlackMessage.scala +++ b/src/main/scala/com/github/pizzaeueu/gitlabbot/domain/SlackMessage.scala @@ -7,7 +7,7 @@ enum BlockType: case section, divider enum TextType: - case mrkdwn extends TextType + case mrkdwn extends TextType case plain_text extends TextType sealed abstract class Text(val `type`: TextType) { diff --git a/src/main/scala/com/github/pizzaeueu/gitlabbot/server/controllers/JobController.scala b/src/main/scala/com/github/pizzaeueu/gitlabbot/server/controllers/JobController.scala index c25b50d..66c4485 100644 --- a/src/main/scala/com/github/pizzaeueu/gitlabbot/server/controllers/JobController.scala +++ b/src/main/scala/com/github/pizzaeueu/gitlabbot/server/controllers/JobController.scala @@ -11,12 +11,11 @@ trait JobController { } case class JobControllerLiveControllerLive(job: Job) extends JobController { - val server: HttpApp[Any, Nothing] = Http.collectZIO[Request] { - case Method.POST -> !! / "gitlab-bot" / "job" / "run-apply-assignees" => - for - _ <- ZIO.logDebug("run-apply-assignees was started through API...") - _ <- job.assignFreeMrs.forkDaemon - yield Response.status(Status.Ok) + val server: HttpApp[Any, Nothing] = Http.collectZIO[Request] { case Method.POST -> !! / "gitlab-bot" / "job" / "run-apply-assignees" => + for + _ <- ZIO.logDebug("run-apply-assignees was started through API...") + _ <- job.assignFreeMrs.forkDaemon + yield Response.status(Status.Ok) } override def build(): HttpApp[Any, Nothing] = server diff --git a/src/main/scala/com/github/pizzaeueu/gitlabbot/slack/services/MessageBuilder.scala b/src/main/scala/com/github/pizzaeueu/gitlabbot/slack/services/MessageBuilder.scala index e657c60..217f23e 100644 --- a/src/main/scala/com/github/pizzaeueu/gitlabbot/slack/services/MessageBuilder.scala +++ b/src/main/scala/com/github/pizzaeueu/gitlabbot/slack/services/MessageBuilder.scala @@ -12,8 +12,7 @@ trait MessageBuilder { } case class MessageBuilderLive(appConfig: AppConfig) extends MessageBuilder { - override def buildMrAssignmentMessage(assignees: List[(MRInfo, List[Teammate])]): Task[SlackMessage] = for - blocks <- ZIO.succeed( + override def buildMrAssignmentMessage(assignees: List[(MRInfo, List[Teammate])]): Task[SlackMessage] = for blocks <- ZIO.succeed( assignees.flatMap { case (mrInfo, teammates) => List( SectionBlock( From 93a76d738e6e031df2a5320d8574558bfb9fd105 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:13:06 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.9.3' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..0b98ed8 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.9.3 +36961cb4effdf367c0930fa540f01e14711ec84e