Commit 18f9b3f
authored
# Which issue does this PR close?
Closes #2440
# Rationale for this change
`./dev/reformat` produced different formatting results depending on the
JDK used to run it. `pom.xml` selected `scalafmtVersion` based on the
active JDK profile: `3.0.0` for `jdk-8`/`jdk-11`, and `3.9.9` for
`jdk-17`/`jdk-21`. However, `scalafmt.conf` declares `version = 3.9.9`,
so only the JDK 17/21 profiles actually matched the intended
formatting rules.
As a result, running the formatter under JDK 8/11 vs JDK 17/21 produced
different indentation for multi-line string interpolations (e.g.
`.getOrElse(...)` continuation lines), causing spurious diffs in `git
status` depending on which JDK happened to be active locally.
# What changes are included in this PR?
Unify `scalafmtVersion` to `3.9.9` across all
`jdk-8`/`jdk-11`/`jdk-17`/`jdk-21` profiles, matching the version
declared in `scalafmt.conf`.
# Are there any user-facing changes?
No
# How was this patch tested?
GHA
# Was this patch authored or co-authored using generative AI tooling?
- [ ] Yes
- [ ] No
1 parent 0d4d779 commit 18f9b3f
6 files changed
Lines changed: 9 additions & 15 deletions
File tree
- spark-extension/src/main/scala/org/apache/spark/sql/auron
- util
- thirdparty/auron-uniffle/src/main/scala/org/apache/spark/sql/execution/auron/shuffle/uniffle
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
60 | 62 | | |
61 | 63 | | |
62 | 64 | | |
| |||
1162 | 1164 | | |
1163 | 1165 | | |
1164 | 1166 | | |
1165 | | - | |
1166 | | - | |
1167 | 1167 | | |
1168 | 1168 | | |
1169 | 1169 | | |
| |||
1175 | 1175 | | |
1176 | 1176 | | |
1177 | 1177 | | |
1178 | | - | |
1179 | | - | |
1180 | 1178 | | |
1181 | 1179 | | |
1182 | 1180 | | |
| |||
1188 | 1186 | | |
1189 | 1187 | | |
1190 | 1188 | | |
1191 | | - | |
1192 | | - | |
1193 | 1189 | | |
1194 | 1190 | | |
1195 | 1191 | | |
| |||
1201 | 1197 | | |
1202 | 1198 | | |
1203 | 1199 | | |
1204 | | - | |
1205 | | - | |
1206 | 1200 | | |
1207 | 1201 | | |
1208 | 1202 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
509 | 509 | | |
510 | 510 | | |
511 | 511 | | |
512 | | - | |
| 512 | + | |
513 | 513 | | |
514 | 514 | | |
515 | 515 | | |
| |||
520 | 520 | | |
521 | 521 | | |
522 | 522 | | |
523 | | - | |
| 523 | + | |
524 | 524 | | |
525 | 525 | | |
526 | 526 | | |
527 | 527 | | |
528 | 528 | | |
529 | 529 | | |
530 | 530 | | |
531 | | - | |
| 531 | + | |
532 | 532 | | |
533 | 533 | | |
534 | 534 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
| 94 | + | |
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
| 77 | + | |
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
175 | | - | |
| 175 | + | |
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
| |||
0 commit comments