Merge pull request #401 from scalacenter/update/scalafmt-core-3.8.0

Update scalafmt-core to 3.8.0
scalacenter · Mar 1, 2024 · 95b8f98 · 95b8f98
2 parents 59e8727 + eba6ff7
commit 95b8f98
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@ b7431a3cdd2f4627de48f4f27a361db88949932f
 
 # Scala Steward: Reformat with scalafmt 3.7.17
 14c30197a7d04b3fc355132881144bd7c95c441b
+
+# Scala Steward: Reformat with scalafmt 3.8.0
+3f1d46f4372c3340624d53469cf236dbb14c0874
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.0"
 project.git=true
 align.preset=none
 assumeStandardLibraryStripMargin = true

diff --git a/src/sbt-test/sbt-1.5/cross-build-scalafixScalaBinaryVersion/build.sbt b/src/sbt-test/sbt-1.5/cross-build-scalafixScalaBinaryVersion/build.sbt
@@ -8,16 +8,22 @@ lazy val root = project
   .in(file("."))
   .settings(
     scalaVersion := Versions.scala212,
-    crossScalaVersions := Seq(Versions.scala212, Versions.scala213, scala3Version),
-    scalacOptions ++= (if (scalaVersion.value.startsWith("2")) Seq("-Ywarn-unused") else Seq()),
+    crossScalaVersions := Seq(
+      Versions.scala212,
+      Versions.scala213,
+      scala3Version
+    ),
+    scalacOptions ++= (if (scalaVersion.value.startsWith("2"))
+                         Seq("-Ywarn-unused")
+                       else Seq()),
     scalafixScalaBinaryVersion := {
       if (scalaBinaryVersion.value == "3") scalafixScalaBinaryVersion.value
       else scalaBinaryVersion.value
     },
     scalafixConfig := {
       if (scalaBinaryVersion.value == "3")
-         Some(file(".scalafix-3.conf"))
+        Some(file(".scalafix-3.conf"))
       else
-         Some(file(".scalafix-2.conf"))
+        Some(file(".scalafix-2.conf"))
     }
   )