From 60549f89410e331e965046482a92728c23c189e3 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 Jan 2025 20:25:20 +0100 Subject: [PATCH 1/2] Revert "Reformat with scalafmt 3.8.3" This reverts commit 186674ddaa8e441a6361b4b677c666eb7bdb4aef. --- project/CleanShadedPlugin.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/CleanShadedPlugin.scala b/project/CleanShadedPlugin.scala index dbde0682..d9c01436 100644 --- 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._ From 143fe5a46b19e85ce72fd1f30d30a24c4f353b44 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 17 Jan 2025 20:27:13 +0100 Subject: [PATCH 2/2] Upgrade scalafmt + sbt-scalafmt + revert wrong 3.8.3 formatting --- .scalafmt.conf | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d135e8af..3f0cfcd5 100644 --- 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/plugins.sbt b/project/plugins.sbt index 977cfec2..6919e4fd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") -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")