Skip to content

Commit 0f4906d

Browse files
committed
[KYUUBI #6674] Bump Scalafmt to 3.9.x
# 🔍 Description ## Issue References 🔗 This pull request fixes # ## Describe Your Solution 🔧 Without this PR: - use and conform Scalafmt 3.7.x - forcing all the imports from the same parent package, which is even violation the max length of the line With this PR: - use and conform Scalafmt 3.9.x - Scalafmt 3.8.2 changes the binpack style: https://github.com/scalameta/scalafmt/releases/tag/v3.8.2 - change to `binPack.importSelectors=singleLine`, minimizing the impacts to existed code ## Types of changes 🔖 - [ ] Bugfix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan 🧪 #### Behavior Without This Pull Request ⚰️ #### Behavior With This Pull Request 🎉 #### Related Unit Tests --- # Checklist 📝 - [ ] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes #6674 from bowenliang123/scalafmt38. Closes #6674 d9f4f9d [Bowen Liang] 3.9.0 438a07d [Bowen Liang] reformat 2df5066 [liangbowen] bump scalafmt to 3.8 Lead-authored-by: Bowen Liang <[email protected]> Co-authored-by: liangbowen <[email protected]> Signed-off-by: Bowen Liang <[email protected]>
1 parent ed96ac1 commit 0f4906d

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.scalafmt.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.5
1+
version = 3.9.0
22
runner.dialect=scala212
33
project.git=true
44

@@ -11,7 +11,7 @@ assumeStandardLibraryStripMargin = true
1111
danglingParentheses.preset = false
1212
docstrings.style = Asterisk
1313
docstrings.wrap = no
14-
importSelectors = singleLine
14+
binPack.importSelectors = singleLine
1515
indent.extendSite = 2
1616
literals.hexDigits = Upper
1717
maxColumn = 100

kyuubi-util-scala/src/test/scala/org/apache/kyuubi/util/AssertionUtils.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ object AssertionUtils {
7676
path: Path,
7777
expectedLines: Traversable[String],
7878
regenScript: String,
79-
splitFirstExpectedLine: Boolean = false)(implicit
80-
prettifier: Prettifier,
81-
pos: Position): Unit = {
79+
splitFirstExpectedLine: Boolean =
80+
false)(implicit prettifier: Prettifier, pos: Position): Unit = {
8281
val fileSource = Source.fromFile(path.toUri, StandardCharsets.UTF_8.name())
8382
try {
8483
def expectedLinesIter = if (splitFirstExpectedLine) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
<spotless.python.includes></spotless.python.includes>
267267
<spotless.python.black.version>22.3.0</spotless.python.black.version>
268268
<!-- Please also update .scalafmt.conf when you change it here -->
269-
<spotless.scala.scalafmt.version>3.7.5</spotless.scala.scalafmt.version>
269+
<spotless.scala.scalafmt.version>3.9.0</spotless.scala.scalafmt.version>
270270

271271
<distMgmtReleaseId>apache.releases.https</distMgmtReleaseId>
272272
<distMgmtReleaseName>Apache Release Distribution Repository</distMgmtReleaseName>

0 commit comments

Comments
 (0)