Merge pull request sbt#280 from scala-steward/update/scalafmt-core-3.8.5

mkurz · web-flow · commit 412294891dff · 2025-01-19T10:04:58.000+01:00
Update scalafmt-core to 3.8.5
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.8.5
+a4e980b0ca9ce4224e84650dff1bf9d44fba3815
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.3"
+version = "3.8.5"
 maxColumn = 150
 align.tokens = []
 docstrings.wrap = keep
diff --git a/src/sbt-test/git-versioning/find-environment-variable/build.sbt b/src/sbt-test/git-versioning/find-environment-variable/build.sbt
@@ -5,4 +5,4 @@ checkVersion := {
   val v = version.value
   val prop = sys.props("project.version")
   assert(v == prop, s"Failed to set version to environment variable.  Found: $v, Expected: $prop")
-}
+}
diff --git a/src/sbt-test/git-versioning/find-environment-variable/project/plugins.sbt b/src/sbt-test/git-versioning/find-environment-variable/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/find-tag-newest/changes/build.sbt b/src/sbt-test/git-versioning/find-tag-newest/changes/build.sbt
@@ -10,4 +10,4 @@ checkVersion := {
   val Seq(v) = spaceDelimited("<arg>").parsed
   val v2 = version.value
   assert(v == v2, s"Expected version is wrong, found ${v2}, expected ${v}")
-}
+}
diff --git a/src/sbt-test/git-versioning/find-tag-newest/project/plugins.sbt b/src/sbt-test/git-versioning/find-tag-newest/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/find-tag/changes/build.sbt b/src/sbt-test/git-versioning/find-tag/changes/build.sbt
@@ -12,4 +12,4 @@ checkVersion := {
   assert(v2 == "1.0.0", s"Failed to detect git tag, found ${v}")
   assert(v == "1.0.0", s"Version from ThisBuild not used, found ${v}")
   assert(isSnapshot.value == false, "For tagged git repos, snapshot should not be true.")
-}
+}
diff --git a/src/sbt-test/git-versioning/find-tag/project/plugins.sbt b/src/sbt-test/git-versioning/find-tag/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/get-message/changes/build.sbt b/src/sbt-test/git-versioning/get-message/changes/build.sbt
@@ -12,4 +12,3 @@ expectAMessage := {
   val headMessage = git.gitHeadMessage.value
   assert(headMessage.get == expectedMessage, s"Expected head message to equal '${expectedMessage}', found ${headMessage}")
 }
-
diff --git a/src/sbt-test/git-versioning/get-message/project/plugins.sbt b/src/sbt-test/git-versioning/get-message/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/multi-module-project-use-describe/changes/build.sbt b/src/sbt-test/git-versioning/multi-module-project-use-describe/changes/build.sbt
@@ -1,10 +1,8 @@
-
-
 val commonSettings = Seq(
   git.useGitDescribe := true,
   git.gitDescribePatterns := Seq(s"${name.value}-*"),
   git.gitTagToVersionNumber := { tag =>
-    if(tag matches s"${name.value}-[0-9].*") Some(tag.replace(s"${name.value}-", ""))
+    if (tag matches s"${name.value}-[0-9].*") Some(tag.replace(s"${name.value}-", ""))
     else None
   }
 )
@@ -24,4 +22,4 @@ checkVersion := {
   val v2 = (b / version).value
   assert(v.startsWith("1.0-1-"), s"multi-module projects should get a version with the matching git describe pattern. $v does not match '1.0-1-'")
   assert(v2 == "2.0", s"multi-module projects should get a version with the matching git describe pattern. $v2 != 2.0")
-}
+}
diff --git a/src/sbt-test/git-versioning/multi-module-project-use-describe/project/plugins.sbt b/src/sbt-test/git-versioning/multi-module-project-use-describe/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/multi-module-project/changes/build.sbt b/src/sbt-test/git-versioning/multi-module-project/changes/build.sbt
@@ -1,6 +1,5 @@
 def proj(name: String) = Project(name, file(name)).enablePlugins(GitVersioning)
 
-
 lazy val a = proj("a")
 lazy val b = proj("b")
 
@@ -14,4 +13,4 @@ checkVersion := {
   val v = (a / version).value
   val v2 = (b / version).value
   assert(v == v2, s"multi-module projects should all share the same verison.  $v != $v2")
-}
+}
diff --git a/src/sbt-test/git-versioning/multi-module-project/project/plugins.sbt b/src/sbt-test/git-versioning/multi-module-project/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/no-base-version/changes/build.sbt b/src/sbt-test/git-versioning/no-base-version/changes/build.sbt
@@ -6,4 +6,4 @@ val checkVersion = taskKey[Unit]("checks the version is the tag versino")
 checkVersion := {
   val v = version.value
   assert(!(v startsWith "1.0"), s"git.baseVersion is meant to be optional ${v}")
-}
+}
diff --git a/src/sbt-test/git-versioning/no-base-version/project/plugins.sbt b/src/sbt-test/git-versioning/no-base-version/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/uncommitted-signifier/changes/build.sbt b/src/sbt-test/git-versioning/uncommitted-signifier/changes/build.sbt
@@ -19,4 +19,4 @@ checkSnapshotVersion := {
   assert(git.gitUncommittedChanges.value, s"Should detect uncommitted git changes.")
   assert(v endsWith "-SNAPSHOT", s"Should have -SNAPSHOT appended when uncommitted changes. ${v}")
   assert(isSnapshot.value == true, "-SNAPSHOT versions should have isSnapshot true.")
-}
+}
diff --git a/src/sbt-test/git-versioning/uncommitted-signifier/project/plugins.sbt b/src/sbt-test/git-versioning/uncommitted-signifier/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/use-describe-with-matching/changes/build.sbt b/src/sbt-test/git-versioning/use-describe-with-matching/changes/build.sbt
@@ -5,7 +5,7 @@ git.versionProperty := "DUMMY_BUILD_VERSION"
 git.useGitDescribe := true
 git.gitDescribePatterns := Seq("module-*")
 git.gitTagToVersionNumber := { tag =>
-  if(tag matches "module-.*") Some(tag drop 7)
+  if (tag matches "module-.*") Some(tag drop 7)
   else None
 }
 
diff --git a/src/sbt-test/git-versioning/use-describe-with-matching/project/plugins.sbt b/src/sbt-test/git-versioning/use-describe-with-matching/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/use-describe/changes/build.sbt b/src/sbt-test/git-versioning/use-describe/changes/build.sbt
@@ -9,4 +9,4 @@ checkVersion := {
   val v = version.value
   assert(v != "1.0.0", s"Version from ThisBuild + git describe not used, found ${v}")
   assert(v startsWith "1.0.0", s"Version from ThisBuild does not start with tag (git describe), found ${v}")
-}
+}
diff --git a/src/sbt-test/git-versioning/use-describe/project/plugins.sbt b/src/sbt-test/git-versioning/use-describe/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/src/sbt-test/git-versioning/with-base-version/changes/build.sbt b/src/sbt-test/git-versioning/with-base-version/changes/build.sbt
@@ -8,4 +8,4 @@ checkVersion := {
   val v = version.value
   assert(v startsWith "1.0", s"git.baseVersion is meant to be optional ${v}")
   assert(isSnapshot.value == true, "isSnapshot should be true if not on a tag.")
-}
+}
diff --git a/src/sbt-test/git-versioning/with-base-version/project/plugins.sbt b/src/sbt-test/git-versioning/with-base-version/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))
diff --git a/test-project/project/plugins.sbt b/test-project/project/plugins.sbt
@@ -1,4 +1,3 @@
-
 val location = file("..").toURI
 
 val sbtGit = RootProject(location)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Scala Steward: Reformat with scalafmt 3.8.5`
	`2`	`+a4e980b0ca9ce4224e84650dff1bf9d44fba3815`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.8.3"`
	`1`	`+version = "3.8.5"`
`2`	`2`	`maxColumn = 150`
`3`	`3`	`align.tokens = []`
`4`	`4`	`docstrings.wrap = keep`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))`
	`1`	`+addSbtPlugin("com.github.sbt" % "sbt-git" % sys.props("project.version"))`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,3 @@ expectAMessage := {`
`12`	`12`	`val headMessage = git.gitHeadMessage.value`
`13`	`13`	`assert(headMessage.get == expectedMessage, s"Expected head message to equal '${expectedMessage}', found ${headMessage}")`
`14`	`14`	`}`
`15`		`-`