Merge pull request #924 from mkurz/scalafmt3.8.4_5.3.x

[5.3.x] Upgrade scalafmt + sbt-scalafmt + revert wrong 3.8.3 formatting
playframework · Jan 17, 2025 · 894e978 · 894e978
2 parents 88d40c5 + 8081984
commit 894e978
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,5 +1,5 @@
 # This file was originally copied from https://github.com/playframework/playframework/blob/main/.scalafmt.conf
-version = 3.8.3
+version = 3.8.4
 runner.dialect = scala213
 align.preset = more
 assumeStandardLibraryStripMargin = true

diff --git a/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala b/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala
@@ -21,6 +21,7 @@ class Application @Inject() (protected val dbConfigProvider: DatabaseConfigProvi
 ) extends AbstractController(cc)
     with HasDatabaseConfigProvider[JdbcProfile] {
   // #di-database-config
+
   import profile.api._
 
   def index(name: String) = Action.async { implicit request =>

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin"           % sys.props.getOrElse(
 addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.6"))
 addSbtPlugin("com.typesafe.play" % "interplay"            % sys.props.get("interplay.version").getOrElse("3.1.7"))
 
-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("com.github.sbt" % "sbt-ci-release" % "1.9.2")