Merge branch 'main' into update/zio-json-yaml-0.7.39

zio · Mar 7, 2025 · 4a2dced · 4a2dced · github-actions · Mar 7, 2025
2 parents 0b26aed + 18d12ad
commit 4a2dced
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -18,3 +18,6 @@ d4a7535a39fe713701919d4312e10e8de78b69d9
 
 # Scala Steward: Reformat with scalafmt 3.9.1
 7c708c88a62ba5e131fa6062dcdcf8c10e3ff9f6
+
+# Scala Steward: Reformat with scalafmt 3.9.3
+3c4849c90c678380da2050b018aa9f427f4c917f
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.9.2
+version = 3.9.3
 maxColumn = 120
 
 align.preset = more

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -16,7 +16,7 @@ object Dependencies {
   val `jwt-core`                = "com.github.jwt-scala"   %% "jwt-core"                % JwtCoreVersion
   val `scala-compat-collection` = "org.scala-lang.modules" %% "scala-collection-compat" % ScalaCompatCollectionVersion
 
-  val scalafmt         = "org.scalameta" %% "scalafmt-dynamic" % "3.9.2"
+  val scalafmt         = "org.scalameta" %% "scalafmt-dynamic" % "3.9.3"
   val scalametaParsers = "org.scalameta" %% "parsers"          % "4.13.2"
 
   val netty =

diff --git a/project/MimaSettings.scala b/project/MimaSettings.scala
@@ -25,7 +25,7 @@ object MimaSettings {
         exclude[Problem]("zio.http.endpoint.openapi.OpenAPIGen#AtomizedMetaCodecs.copy"),
         exclude[IncompatibleMethTypeProblem]("zio.http.Middleware.addHeader"),
         exclude[IncompatibleMethTypeProblem]("zio.http.HandlerAspect.addHeader"),
-        ProblemFilters.exclude[ReversedMissingMethodProblem]("zio.http.Server.installInternal")
+        ProblemFilters.exclude[ReversedMissingMethodProblem]("zio.http.Server.installInternal"),
       ),
       mimaFailOnProblem := failOnProblem,
     )

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,7 @@ addSbtPlugin("org.scalameta"       % "sbt-scalafmt"              % "2.5.4")
 addSbtPlugin("pl.project13.scala"  % "sbt-jmh"                   % "0.4.7")
 addSbtPlugin("com.timushev.sbt"    % "sbt-updates"               % "0.6.4")
 addSbtPlugin("io.spray"            % "sbt-revolver"              % "0.10.0")
-addSbtPlugin("com.github.sbt"      % "sbt-github-actions"        % "0.24.0")
+addSbtPlugin("com.github.sbt"      % "sbt-github-actions"        % "0.25.0")
 addSbtPlugin("com.github.sbt"      % "sbt-ci-release"            % "1.9.2")
 addSbtPlugin("dev.zio"             % "zio-sbt-website"           % "0.4.0-alpha.31")
 addSbtPlugin("de.heikoseeberger"   % "sbt-header"                % "5.10.0")