Skip to content
New issue

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

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

Already on GitHub? # to your account

Bump Scalafmt to 3.8.x #6674

Open
wants to merge 2 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
4 changes: 2 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.5
version = 3.8.6
runner.dialect=scala212
project.git=true

Expand All @@ -11,7 +11,7 @@ assumeStandardLibraryStripMargin = true
danglingParentheses.preset = false
docstrings.style = Asterisk
docstrings.wrap = no
importSelectors = singleLine
binPack.importSelectors = singleLine
indent.extendSite = 2
literals.hexDigits = Upper
maxColumn = 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ object AssertionUtils {
path: Path,
expectedLines: Traversable[String],
regenScript: String,
splitFirstExpectedLine: Boolean = false)(implicit
prettifier: Prettifier,
pos: Position): Unit = {
splitFirstExpectedLine: Boolean =
false)(implicit prettifier: Prettifier, pos: Position): Unit = {
val fileSource = Source.fromFile(path.toUri, StandardCharsets.UTF_8.name())
try {
def expectedLinesIter = if (splitFirstExpectedLine) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<spotless.python.includes></spotless.python.includes>
<spotless.python.black.version>22.3.0</spotless.python.black.version>
<!-- Please also update .scalafmt.conf when you change it here -->
<spotless.scala.scalafmt.version>3.7.5</spotless.scala.scalafmt.version>
<spotless.scala.scalafmt.version>3.8.6</spotless.scala.scalafmt.version>

<distMgmtReleaseId>apache.releases.https</distMgmtReleaseId>
<distMgmtReleaseName>Apache Release Distribution Repository</distMgmtReleaseName>
Expand Down
Loading