From f3c301c66e3376895e2165ebb827f87f08ab07cd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 10 Nov 2022 22:08:52 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.6.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2ffee3a2..96088dc8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.5.9 +version=3.6.1 style = defaultWithAlign maxColumn = 100 assumeStandardLibraryStripMargin = true From 46322f351d6186e227740cf0e7245018957d39d0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 10 Nov 2022 22:09:02 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.6.1 Executed command: scalafmt --non-interactive --- examples/scalapb-dotty/src/main/scala/Main.scala | 2 +- src/sbt-test/settings/lazy-protoc-resolution/build.sbt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/scalapb-dotty/src/main/scala/Main.scala b/examples/scalapb-dotty/src/main/scala/Main.scala index 242ce234..2f4670cd 100644 --- a/examples/scalapb-dotty/src/main/scala/Main.scala +++ b/examples/scalapb-dotty/src/main/scala/Main.scala @@ -1,7 +1,7 @@ import myproto.test.TestMessage @main def hello() = { - val x = TestMessage(foo=Some(3)) + val x = TestMessage(foo = Some(3)) println("Welcome!") println(x) println(x.serializedSize) diff --git a/src/sbt-test/settings/lazy-protoc-resolution/build.sbt b/src/sbt-test/settings/lazy-protoc-resolution/build.sbt index a07830e1..5e5dc912 100644 --- a/src/sbt-test/settings/lazy-protoc-resolution/build.sbt +++ b/src/sbt-test/settings/lazy-protoc-resolution/build.sbt @@ -1,20 +1,20 @@ // PB.targets, no proto lazy val a = project .settings( - PB.protocVersion := "1.2.3+non-existing-a", + PB.protocVersion := "1.2.3+non-existing-a", Compile / PB.targets := Seq(PB.gens.java -> (Compile / sourceManaged).value) ) // no PB.targets, one proto lazy val b = project .settings( - PB.protocVersion := "1.2.3+non-existing-b", + PB.protocVersion := "1.2.3+non-existing-b" ) // PB.targets, one ignored proto lazy val c = project .settings( - PB.protocVersion := "1.2.3+non-existing-c", - Compile / PB.targets := Seq(PB.gens.java -> (Compile / sourceManaged).value), + PB.protocVersion := "1.2.3+non-existing-c", + Compile / PB.targets := Seq(PB.gens.java -> (Compile / sourceManaged).value), PB.generate / excludeFilter := "ignored.proto" - ) \ No newline at end of file + ) From b4d0bca0eea1a178abe34454bebed749dd4544e5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 10 Nov 2022 22:09:03 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.6.1' 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..6552a8c8 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.6.1 +46322f351d6186e227740cf0e7245018957d39d0