From 94f3cb269dc87120370aa1fbee26b0b0b505ea3c Mon Sep 17 00:00:00 2001 From: "scala-center-steward[bot]" <111975575+scala-center-steward[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:19:34 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ba6d5896..387ba5f1 100644 --- 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 From 3f1d46f4372c3340624d53469cf236dbb14c0874 Mon Sep 17 00:00:00 2001 From: "scala-center-steward[bot]" <111975575+scala-center-steward[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:19:39 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.0 Executed command: scalafmt --non-interactive --- .../build.sbt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 index 35f42a51..29d01e99 100644 --- 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")) } ) From eba6ff729928bed88701ead9852bb5f7dd9fd14b Mon Sep 17 00:00:00 2001 From: "scala-center-steward[bot]" <111975575+scala-center-steward[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:19:39 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.0' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ae932b74..535f3784 100644 --- 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