Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.6.1 #321

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.6.1
46322f351d6186e227740cf0e7245018957d39d0
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=3.5.9
version=3.6.1
style = defaultWithAlign
maxColumn = 100
assumeStandardLibraryStripMargin = true
Expand Down
2 changes: 1 addition & 1 deletion examples/scalapb-dotty/src/main/scala/Main.scala
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/sbt-test/settings/lazy-protoc-resolution/build.sbt
Original file line number Diff line number Diff line change
@@ -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"
)
)