From dee962659af8319075a9b6139b228b0f2ca0122c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Jan 2025 05:36:34 +0100 Subject: [PATCH] Update scalafmt-core to 3.8.6 (#409) * Update scalafmt-core to 3.8.6 * Reformat with scalafmt 3.8.6 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .git-blame-ignore-revs | 2 ++ .scalafmt.conf | 2 +- build.sbt | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..979853f --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.6 +8fcae17ccd45b4ce4020f5c7dc626ace7893af21 diff --git a/.scalafmt.conf b/.scalafmt.conf index 9ad1dcb..e36762b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.3" +version = "3.8.6" runner.dialect = scala213source3 rewrite.rules = [SortImports, RedundantBraces] fileOverride { diff --git a/build.sbt b/build.sbt index eb79cda..20a41cc 100644 --- a/build.sbt +++ b/build.sbt @@ -54,12 +54,11 @@ lazy val core = projectMatrix PB.gens.java -> (Compile / sourceManaged).value / "scalapb", scalapb.gen() -> (Compile / sourceManaged).value / "scalapb" ), - Compile / packageBin / packageOptions += { + Compile / packageBin / packageOptions += Package.ManifestAttributes( "ScalaPB-Options-Proto" -> "scalapb/validate-options.proto" - ) - }, + ), compileOrder := CompileOrder.JavaThenScala ) .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3))