Merge pull request #980 from mkurz/scalafmt3.8.4

Upgrade scalafmt + sbt-scalafmt + revert wrong 3.8.3 formatting
playframework · Jan 17, 2025 · 2080a74 · 2080a74
2 parents 4a69e3f + aeba45f
commit 2080a74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -11,4 +11,4 @@ rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abst
 spaces.inImportCurlyBraces = true   # more idiomatic to include whitepsace in import x.{ yyy }
 trailingCommas = preserve
 newlines.afterCurlyLambda = preserve
-version = 3.8.3
+version = 3.8.4
diff --git a/project/CleanShadedPlugin.scala b/project/CleanShadedPlugin.scala
@@ -4,6 +4,7 @@
  */
 
 // https://github.com/sbt/sbt-dirty-money/blob/master/src/main/scala/sbtdirtymoney/DirtyMoneyPlugin.scala
+
 import sbt._
 import Keys._
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.eed3si9n"       % "sbt-assembly"    % "2.3.0")
-addSbtPlugin("org.scalameta"      % "sbt-scalafmt"    % "2.5.2")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"    % "2.5.4")
 addSbtPlugin("com.typesafe"       % "sbt-mima-plugin" % "1.1.4")
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"      % "5.10.0")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"         % "0.4.7")
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
      */
     // https://github.com/sbt/sbt-dirty-money/blob/master/src/main/scala/sbtdirtymoney/DirtyMoneyPlugin.scala
     import sbt._
     import Keys._
@@ Expand Down @@