Skip to content

Commit bfa9167

Browse files
mateuszkuta256mateuszkuta256
authored
Bump scalafmt version (#1543)
* bump scalafmt 2_11 * bump scalafmt 2_12 * bump scalafmt 2_13 * bump scalafmt 3_1 * bump scalafmt 3_2 * bump scalafmt 3_3 * bump scalafmt
1 parent dcbfa36 commit bfa9167

File tree

9 files changed

+203
-223
lines changed

9 files changed

+203
-223
lines changed

‎.scalafmt.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
align.openParenCallSite = false
22
align.openParenDefnSite = false
33
continuationIndent.defnSite = 2
4-
danglingParentheses = true
5-
docstrings = JavaDoc
4+
danglingParentheses.preset = true
5+
docstrings.style = Asterisk
66
importSelectors = singleLine
77
maxColumn = 120
88
verticalMultiline.newlineBeforeImplicitKW = true

‎docs/phase_scalafmt.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ The extension provides default configuration, but there are 2 ways to use custom
4343
- Put `.scalafmt.conf` at root of your workspace
4444
- Pass `.scalafmt.conf` in via `config` attribute
4545

46+
If using scala 3 you must append `runner.dialect = scala3` to .scalafmt.conf
47+
4648
## IntelliJ plugin support
4749

4850
If you use IntelliJ Bazel plugin, then you should check the [Customizable Phase](/docs/customizable_phase.md#cooperation-with-intellij-plugin) page.

‎scala/scalafmt/scalafmt_repositories.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ def scalafmt_repositories(
4040
"com_geirsson_metaconfig_core",
4141
"com_geirsson_metaconfig_typesafe_config",
4242
]
43-
if SCALA_MAJOR_VERSION == "2.13" or SCALA_MAJOR_VERSION == "3.1":
43+
if SCALA_MAJOR_VERSION != "2.11":
44+
artifact_ids.append("com_lihaoyi_geny")
45+
if SCALA_MAJOR_VERSION == "2.13" or SCALA_MAJOR_VERSION.startswith("3"):
4446
artifact_ids.append("io_bazel_rules_scala_scala_parallel_collections")
4547

4648
repositories(

‎third_party/repositories/scala_2_11.bzl

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ artifacts = {
7070
"sha256": "3e0889e95f5324da6420461f7147cb508241ed957ac5cfedc25eef19c5448f26",
7171
},
7272
"org_scalameta_common": {
73-
"artifact": "org.scalameta:common_2.11:4.3.0",
74-
"sha256": "6330798bcbd78d14d371202749f32efda0465c3be5fd057a6055a67e21335ba0",
73+
"artifact": "org.scalameta:common_2.11:4.3.22",
74+
"sha256": "eaf3bc9c5168a52b4da0e1d39ea1ef2570a675b7de56cce7f64389835b20ac09",
7575
"deps": [
7676
"@com_lihaoyi_sourcecode",
7777
"@io_bazel_rules_scala_scala_library",
@@ -109,37 +109,36 @@ artifacts = {
109109
],
110110
},
111111
"org_scalameta_parsers": {
112-
"artifact": "org.scalameta:parsers_2.11:4.3.0",
113-
"sha256": "724382abfac27b32dec6c21210562bc7e1b09b5268ccb704abe66dcc8844beeb",
112+
"artifact": "org.scalameta:parsers_2.11:4.3.22",
113+
"sha256": "c5d2d0e95c5e0fa49c0ad8e269a7e431cd74ec56b7c6bd080a39d102c36cc36d",
114114
"deps": [
115115
"@io_bazel_rules_scala_scala_library",
116116
"@org_scalameta_trees",
117117
],
118118
},
119119
"org_scalameta_scalafmt_core": {
120-
"artifact": "org.scalameta:scalafmt-core_2.11:2.3.2",
121-
"sha256": "6bf391e0e1d7369fda83ddaf7be4d267bf4cbccdf2cc31ff941999a78c30e67f",
120+
"artifact": "org.scalameta:scalafmt-core_2.11:2.7.5",
121+
"sha256": "25cd19d57e0d5e23574ba4a3a200c31432f7ebd0e55ca565cfd06ad71482d940",
122122
"deps": [
123123
"@com_geirsson_metaconfig_core",
124124
"@com_geirsson_metaconfig_typesafe_config",
125125
"@io_bazel_rules_scala_scala_library",
126126
"@io_bazel_rules_scala_scala_reflect",
127127
"@org_scalameta_scalameta",
128-
"@org_scala_lang_modules_scala_collection_compat",
129128
],
130129
},
131130
"org_scalameta_scalameta": {
132-
"artifact": "org.scalameta:scalameta_2.11:4.3.0",
133-
"sha256": "94fe739295447cd3ae877c279ccde1def06baea02d9c76a504dda23de1d90516",
131+
"artifact": "org.scalameta:scalameta_2.11:4.3.22",
132+
"sha256": "c66ea80ff72fbb1a5cc0c11c6365106c9750ad05f8cf17adb88ac8b10925ef72",
134133
"deps": [
135134
"@io_bazel_rules_scala_scala_library",
136135
"@org_scala_lang_scalap",
137136
"@org_scalameta_parsers",
138137
],
139138
},
140139
"org_scalameta_trees": {
141-
"artifact": "org.scalameta:trees_2.11:4.3.0",
142-
"sha256": "d24d5d63d8deafe646d455c822593a66adc6fdf17c8373754a3834a6e92a8a72",
140+
"artifact": "org.scalameta:trees_2.11:4.3.22",
141+
"sha256": "59c3c27a579d893118e4e6b29db7b17fec010b3bb63cafe995be50fe907d4026",
143142
"deps": [
144143
"@com_thesamet_scalapb_scalapb_runtime",
145144
"@io_bazel_rules_scala_scala_library",
@@ -148,8 +147,8 @@ artifacts = {
148147
],
149148
},
150149
"org_typelevel_paiges_core": {
151-
"artifact": "org.typelevel:paiges-core_2.11:0.2.4",
152-
"sha256": "aa66fbe0457ca5cb5b9e522d4cb873623bb376a2e1ff58c464b5194c1d87c241",
150+
"artifact": "org.typelevel:paiges-core_2.11:0.3.0",
151+
"sha256": "fa697cb6d1e03cb143183c45cc543734e7600dcb4dee63005738d28a722c202e",
153152
"deps": [
154153
"@io_bazel_rules_scala_scala_library",
155154
],
@@ -166,15 +165,15 @@ artifacts = {
166165
],
167166
},
168167
"com_thesamet_scalapb_lenses": {
169-
"artifact": "com.thesamet.scalapb:lenses_2.11:0.9.0",
170-
"sha256": "f4809760edee6abc97a7fe9b7fd6ae5fe1006795b1dc3963ab4e317a72f1a385",
168+
"artifact": "com.thesamet.scalapb:lenses_2.11:0.9.7",
169+
"sha256": "f8e3b526ceac998652b296014e9ab4c0ab906a40837dd1dfcf6948b6f5a1a8bf",
171170
"deps": [
172171
"@io_bazel_rules_scala_scala_library",
173172
],
174173
},
175174
"com_thesamet_scalapb_scalapb_runtime": {
176-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.11:0.9.0",
177-
"sha256": "ab1e449a18a9ce411eb3fec31bdbca5dd5fae4475b1557bb5e235a7b54738757",
175+
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.11:0.9.7",
176+
"sha256": "5131033e9536727891a38004ec707a93af1166cb8283c7db711c2c105fbf289e",
178177
"deps": [
179178
"@com_google_protobuf_protobuf_java",
180179
"@com_lihaoyi_fastparse",
@@ -183,8 +182,8 @@ artifacts = {
183182
],
184183
},
185184
"com_lihaoyi_fansi": {
186-
"artifact": "com.lihaoyi:fansi_2.11:0.2.5",
187-
"sha256": "1ff0a8304f322c1442e6bcf28fab07abf3cf560dd24573dbe671249aee5fc488",
185+
"artifact": "com.lihaoyi:fansi_2.11:0.2.6",
186+
"sha256": "63878260e23a1e28ecd8d6987d5feda9d72507b476137b9f642ac2c75035a9c8",
188187
"deps": [
189188
"@com_lihaoyi_sourcecode",
190189
"@io_bazel_rules_scala_scala_library",
@@ -198,8 +197,8 @@ artifacts = {
198197
],
199198
},
200199
"com_lihaoyi_pprint": {
201-
"artifact": "com.lihaoyi:pprint_2.11:0.5.3",
202-
"sha256": "fb5e4921e7dff734d049e752a482d3a031380d3eea5caa76c991312dee9e6991",
200+
"artifact": "com.lihaoyi:pprint_2.11:0.5.4",
201+
"sha256": "9b31150ee7f07212a825e02fca56e0999789d2b8ec720a84b75ce29ca7e195b5",
203202
"deps": [
204203
"@com_lihaoyi_fansi",
205204
"@com_lihaoyi_sourcecode",
@@ -218,8 +217,8 @@ artifacts = {
218217
"sha256": "161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9",
219218
},
220219
"com_geirsson_metaconfig_core": {
221-
"artifact": "com.geirsson:metaconfig-core_2.11:0.9.4",
222-
"sha256": "5d5704a1f1c4f74aed26248eeb9b577274d570b167cec0bf51d2908609c29118",
220+
"artifact": "com.geirsson:metaconfig-core_2.11:0.9.10",
221+
"sha256": "c8b8f64e42d52a0bd7af1094c46c1fc15773f3bc62d014b833509679e857035b",
223222
"deps": [
224223
"@com_lihaoyi_pprint",
225224
"@io_bazel_rules_scala_scala_library",
@@ -228,13 +227,12 @@ artifacts = {
228227
],
229228
},
230229
"com_geirsson_metaconfig_typesafe_config": {
231-
"artifact": "com.geirsson:metaconfig-typesafe-config_2.11:0.9.4",
232-
"sha256": "52d2913640f4592402aeb2f0cec5004893d02acf26df4aa1cf8d4dcb0d2b21c7",
230+
"artifact": "com.geirsson:metaconfig-typesafe-config_2.11:0.9.10",
231+
"sha256": "6260f0994d06d666b931d739635fe94b29dbcb758c421553bc4fab8822d650aa",
233232
"deps": [
234233
"@com_geirsson_metaconfig_core",
235234
"@com_typesafe_config",
236235
"@io_bazel_rules_scala_scala_library",
237-
"@org_scala_lang_modules_scala_collection_compat",
238236
],
239237
},
240238
"io_bazel_rules_scala_org_openjdk_jmh_jmh_core": {

‎third_party/repositories/scala_2_12.bzl

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ artifacts = {
7070
"sha256": "24985eb43e295a9dd77905ada307a850ca25acf819cdb579c093fc6987b0dbc2",
7171
},
7272
"org_scalameta_common": {
73-
"artifact": "org.scalameta:common_2.12:4.3.0",
74-
"sha256": "3bdb2ff71d3e86f94b4d31d2c40442f533655860749a92fd17e1f29b8deb8baa",
73+
"artifact": "org.scalameta:common_2.12:4.4.27",
74+
"sha256": "71c9d13df52d0f2169befbb078af37175c18f50456ebdf0410b99ebae0df3a9f",
7575
"deps": [
7676
"@com_lihaoyi_sourcecode",
7777
"@io_bazel_rules_scala_scala_library",
@@ -85,12 +85,11 @@ artifacts = {
8585
],
8686
},
8787
"org_scalameta_fastparse": {
88-
"artifact": "org.scalameta:fastparse_2.12:1.0.1",
89-
"sha256": "387ced762e93915c5f87fed59d8453e404273f49f812d413405696ce20273aa5",
88+
"artifact": "org.scalameta:fastparse-v2_2.12:2.3.1",
89+
"sha256": "c8ddc110da4b2e3d204e44b2629f4663edeb61094fa7ab4749f2f82b1b0cb026",
9090
"deps": [
9191
"@com_lihaoyi_sourcecode",
92-
"@io_bazel_rules_scala_scala_library",
93-
"@org_scalameta_fastparse_utils",
92+
"@com_lihaoyi_geny",
9493
],
9594
},
9695
"org_scalameta_fastparse_utils": {
@@ -101,62 +100,64 @@ artifacts = {
101100
"@io_bazel_rules_scala_scala_library",
102101
],
103102
},
103+
"com_lihaoyi_geny": {
104+
"artifact": "com.lihaoyi:geny_2.13:0.6.5",
105+
"sha256": "ca3857a3f95266e0d87e1a1f26c8592c53c12ac7203f911759415f6c8a43df7d",
106+
},
104107
"org_scala_lang_modules_scala_collection_compat": {
105-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.1.2",
106-
"sha256": "8aab3e1f9dd7bc392a2e27cf168af94fdc7cc2752131fc852192302fb21efdb4",
108+
"artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.4.3",
109+
"sha256": "8499054aa4e490ae94703b2be653af954db5193e277673f17886bd2e57d16c90",
107110
"deps": [
108111
"@io_bazel_rules_scala_scala_library",
109112
],
110113
},
111114
"org_scalameta_parsers": {
112-
"artifact": "org.scalameta:parsers_2.12:4.3.0",
113-
"sha256": "d9f87d03b6b5e942f263db6dab75937493bfcb0fe7cfe2cda6567bf30f23ff3a",
115+
"artifact": "org.scalameta:parsers_2.12:4.4.27",
116+
"sha256": "5c25dbb82d9c3cb206373297373be4014d3e189fe674a8b1fdb43d5ea5d5a963",
114117
"deps": [
115118
"@io_bazel_rules_scala_scala_library",
116119
"@org_scalameta_trees",
117120
],
118121
},
119122
"org_scalameta_scalafmt_core": {
120-
"artifact": "org.scalameta:scalafmt-core_2.12:2.3.2",
121-
"sha256": "4788e2045e99f4624162d3182016a05032a7ab1324c4a28af433aa070f916773",
123+
"artifact": "org.scalameta:scalafmt-core_2.12:3.0.0",
124+
"sha256": "8888f2a37d9ca0f10ff97d2eb2027c530e15e4a38aa2447e5b13d1ab3605339b",
122125
"deps": [
123126
"@com_geirsson_metaconfig_core",
124127
"@com_geirsson_metaconfig_typesafe_config",
125128
"@io_bazel_rules_scala_scala_library",
126129
"@io_bazel_rules_scala_scala_reflect",
127130
"@org_scalameta_scalameta",
128-
"@org_scala_lang_modules_scala_collection_compat",
129131
],
130132
},
131133
"org_scalameta_scalameta": {
132-
"artifact": "org.scalameta:scalameta_2.12:4.3.0",
133-
"sha256": "4d9487b434cbe9d89033824a4fc902dc7c782eea94961e8575df91ae96b10d6a",
134+
"artifact": "org.scalameta:scalameta_2.12:4.4.27",
135+
"sha256": "bd62786fcae33f46e1c981b1ff7bbf3934b5dc1916ddeba259a787759ba1afd9",
134136
"deps": [
135137
"@io_bazel_rules_scala_scala_library",
136138
"@org_scala_lang_scalap",
137139
"@org_scalameta_parsers",
138140
],
139141
},
140142
"org_scalameta_trees": {
141-
"artifact": "org.scalameta:trees_2.12:4.3.0",
142-
"sha256": "020b53681dd8e148d74ffa282276994bcb0f06c3425fb9a4bb9f8d161e22187a",
143+
"artifact": "org.scalameta:trees_2.12:4.4.27",
144+
"sha256": "bab0a348edcdbd56832fdc0b8ca5576a4aa25aa67c5365a5d74b86c8b15ac21c",
143145
"deps": [
144-
"@com_thesamet_scalapb_scalapb_runtime",
145146
"@io_bazel_rules_scala_scala_library",
146147
"@org_scalameta_common",
147148
"@org_scalameta_fastparse",
148149
],
149150
},
150151
"org_typelevel_paiges_core": {
151-
"artifact": "org.typelevel:paiges-core_2.12:0.2.4",
152-
"sha256": "594ca130526023e80549484e45400d09810fa39d9fd6b4663830a00be2a8556a",
152+
"artifact": "org.typelevel:paiges-core_2.12:0.4.1",
153+
"sha256": "2a27d525fbf3274f1887b4d7af4b8e337c5b00c054c1e31f49640460c73dc947",
153154
"deps": [
154155
"@io_bazel_rules_scala_scala_library",
155156
],
156157
},
157158
"com_typesafe_config": {
158-
"artifact": "com.typesafe:config:1.3.3",
159-
"sha256": "b5f1d6071f1548d05be82f59f9039c7d37a1787bd8e3c677e31ee275af4a4621",
159+
"artifact": "com.typesafe:config:1.4.1",
160+
"sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f",
160161
},
161162
"org_scala_lang_scalap": {
162163
"artifact": "org.scala-lang:scalap:2.12.18",
@@ -183,11 +184,10 @@ artifacts = {
183184
],
184185
},
185186
"com_lihaoyi_fansi": {
186-
"artifact": "com.lihaoyi:fansi_2.12:0.2.5",
187-
"sha256": "7d752240ec724e7370903c25b69088922fa3fb6831365db845cd72498f826eca",
187+
"artifact": "com.lihaoyi:fansi_2.12:0.2.12",
188+
"sha256": "c142f910ddbbc0370763d969095b4d94c945b394b96ff7d0943cf086b3c24249",
188189
"deps": [
189190
"@com_lihaoyi_sourcecode",
190-
"@io_bazel_rules_scala_scala_library",
191191
],
192192
},
193193
"com_lihaoyi_fastparse": {
@@ -198,28 +198,24 @@ artifacts = {
198198
],
199199
},
200200
"com_lihaoyi_pprint": {
201-
"artifact": "com.lihaoyi:pprint_2.12:0.5.3",
202-
"sha256": "2e18aa0884870537bf5c562255fc759d4ebe360882b5cb2141b30eda4034c71d",
201+
"artifact": "com.lihaoyi:pprint_2.12:0.6.4",
202+
"sha256": "e357e0217c776f4bf2ff4d00aa66398aeecdc81f44803ed677eb5c832de758b0",
203203
"deps": [
204204
"@com_lihaoyi_fansi",
205205
"@com_lihaoyi_sourcecode",
206-
"@io_bazel_rules_scala_scala_library",
207206
],
208207
},
209208
"com_lihaoyi_sourcecode": {
210-
"artifact": "com.lihaoyi:sourcecode_2.12:0.1.7",
211-
"sha256": "f07d79f0751ac275cc09b92caf3618f0118d153da7868b8f0c9397ce93c5f926",
212-
"deps": [
213-
"@io_bazel_rules_scala_scala_library",
214-
],
209+
"artifact": "com.lihaoyi:sourcecode_2.12:0.2.5",
210+
"sha256": "94f9c383f4d9b8c382de243b0968c02a232be77ff0f1c6677d042717157295ea",
215211
},
216212
"com_google_protobuf_protobuf_java": {
217213
"artifact": "com.google.protobuf:protobuf-java:3.10.0",
218214
"sha256": "161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9",
219215
},
220216
"com_geirsson_metaconfig_core": {
221-
"artifact": "com.geirsson:metaconfig-core_2.12:0.9.4",
222-
"sha256": "970b3d74fc9b2982d9fb31d93f460000b41fff21c0b9d9ef9476ed333a010b2a",
217+
"artifact": "com.geirsson:metaconfig-core_2.12:0.9.14",
218+
"sha256": "5efc7a4c5c47df5001c21415ae4e6f37621d731c1895e606029b888728da73c6",
223219
"deps": [
224220
"@com_lihaoyi_pprint",
225221
"@io_bazel_rules_scala_scala_library",
@@ -228,13 +224,12 @@ artifacts = {
228224
],
229225
},
230226
"com_geirsson_metaconfig_typesafe_config": {
231-
"artifact": "com.geirsson:metaconfig-typesafe-config_2.12:0.9.4",
232-
"sha256": "3165f30a85d91de7f8ba714e685a6b822bd1cbb365946f5d708163725df3ef5d",
227+
"artifact": "com.geirsson:metaconfig-typesafe-config_2.12:0.9.14",
228+
"sha256": "5962872d18d70de9df2bf969b449295b0f483870e6bd3f229f44a0578d83ce71",
233229
"deps": [
234230
"@com_geirsson_metaconfig_core",
235231
"@com_typesafe_config",
236232
"@io_bazel_rules_scala_scala_library",
237-
"@org_scala_lang_modules_scala_collection_compat",
238233
],
239234
},
240235
"io_bazel_rules_scala_org_openjdk_jmh_jmh_core": {

0 commit comments

Comments
 (0)