From 3c135bd1de6d30609c3d46335e5ba880b70bdd36 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jun 2024 22:08:57 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e1e84221..3697d495 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.2 runner.dialect = scala3 align.preset = none docstrings.style = keep From 7eacc909584f13d0a291e4523fb42be9dde9003a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jun 2024 22:09:17 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive --- build.sbt | 3 ++- project/MultiScalaProject.scala | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0414ac4e..549f9749 100644 --- a/build.sbt +++ b/build.sbt @@ -316,7 +316,8 @@ lazy val scalafixTests = project .settings( scalaVersion := scalafixScala212, publish / skip := true, - libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full, + libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion + .full, scalafixTestkitOutputSourceDirectories := Seq( outputCross.value, output212.value, diff --git a/project/MultiScalaProject.scala b/project/MultiScalaProject.scala index 3f0e88ae..eac27e90 100644 --- a/project/MultiScalaProject.scala +++ b/project/MultiScalaProject.scala @@ -43,7 +43,8 @@ trait MultiScala { Compile / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / base / "src" / "main" / "scala", Compile / unmanagedSourceDirectories += - (ThisBuild / baseDirectory).value / base / "src" / "main" / ("scala-" + scalaBinaryVersion.value), + (ThisBuild / baseDirectory) + .value / base / "src" / "main" / ("scala-" + scalaBinaryVersion.value), Compile / unmanagedSourceDirectories ++= { val sourceDir = (ThisBuild / baseDirectory).value / base / "src" / "main" CrossVersion.partialVersion(scalaVersion.value) match { From 25c0528b527fc45c9d24f6d6775ada101e50ed89 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jun 2024 22:09:17 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..1b01d35e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.2 +7eacc909584f13d0a291e4523fb42be9dde9003a