Skip to content

Commit d9e6b1a

Browse files
mblandmbland
authored
Bump Scalafmt from 3.8.3 to 3.8.6 (#1692)
Description Updates Scalafmt to 3.8.6 and adjusts scala/scalafmt/scalafmt_repositories.bzl to use the new dependency repositories. Part of #1482 and #1652. Most of the changes are automated updates to third_party/repositories/scala_*.bzl files from running scripts/create_repository.py. Also deleted the com_geirsson_metaconfig_* artifacts replaced by com_scalameta_metaconfig_* artifacts for Scala >= 2.12. Specifically core, pprint, and typesafe_config. Motivation This is to ensure Scalafmt is as current as can be before landing Bzlmod and Bazel 8 compatibility changes.
1 parent 0a06492 commit d9e6b1a

File tree

14 files changed

+561
-498
lines changed

14 files changed

+561
-498
lines changed

‎.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.6"
22
runner.dialect = scala213
33
align.openParenCallSite = false
44
align.openParenDefnSite = false

‎scala/scalafmt/scalafmt_repositories.bzl

+6-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ def scalafmt_default_config(path = ".scalafmt.conf", **kwargs):
3434
scalafmt_config(name = "scalafmt_default", path = "//:" + path, **kwargs)
3535

3636
_SCALAFMT_DEPS = [
37-
"com_geirsson_metaconfig_core",
38-
"com_geirsson_metaconfig_typesafe_config",
3937
"com_lihaoyi_fansi",
4038
"com_typesafe_config",
4139
"org_scala_lang_scalap",
@@ -48,15 +46,20 @@ _SCALAFMT_DEPS = [
4846
] + SCALAPB_COMPILE_ARTIFACT_IDS
4947

5048
_SCALAFMT_DEPS_2_11 = [
49+
"com_geirsson_metaconfig_core",
50+
"com_geirsson_metaconfig_typesafe_config",
5151
"com_lihaoyi_pprint",
5252
"org_scalameta_fastparse",
5353
"org_scalameta_fastparse_utils",
5454
]
5555

5656
_SCALAFMT_DEPS_2_12 = [
57-
"com_geirsson_metaconfig_pprint",
5857
"org_scalameta_mdoc_parser",
58+
"org_scalameta_metaconfig_core",
59+
"org_scalameta_metaconfig_pprint",
60+
"org_scalameta_metaconfig_typesafe_config",
5961
"org_scalameta_scalafmt_config",
62+
"org_scalameta_scalafmt_macros",
6063
"org_scalameta_scalafmt_sysops",
6164
]
6265

‎scripts/create_repository.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
SBT_COMPILER_INTERFACE_VERSION = '1.10.7'
3030
SBT_UTIL_INTERFACE_VERSION = '1.10.7'
3131
SCALATEST_VERSION = "3.2.19"
32-
SCALAFMT_VERSION = "3.8.3"
32+
SCALAFMT_VERSION = "3.8.6"
3333
KIND_PROJECTOR_VERSION = "0.13.3"
3434
PROTOBUF_JAVA_VERSION = "4.29.3"
3535
JLINE_VERSION = '3.29.0'

‎test/scalafmt/.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.6"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt2.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.6"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt3.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.6"
22
runner.dialect = scala3
33
maxColumn = 40
44
lineEndings = preserve

‎third_party/repositories/scala_2_12.bzl

+65-56
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,6 @@ Mostly generated and updated by scripts/create_repository.py.
66
scala_version = "2.12.20"
77

88
artifacts = {
9-
"com_geirsson_metaconfig_core": {
10-
"artifact": "com.geirsson:metaconfig-core_2.12:0.12.0",
11-
"sha256": "902dba2da97ed2b29f4921fe0bb2f2c58e94840f2e7ece89d5d0f91f6307c21e",
12-
"deps": [
13-
"@io_bazel_rules_scala_scala_library",
14-
"@io_bazel_rules_scala_scala_reflect",
15-
"@com_geirsson_metaconfig_pprint",
16-
"@org_scala_lang_modules_scala_collection_compat",
17-
"@org_typelevel_paiges_core",
18-
],
19-
},
20-
"com_geirsson_metaconfig_pprint": {
21-
"artifact": "com.geirsson:metaconfig-pprint_2.12:0.12.0",
22-
"sha256": "31d651bd513cc3f1588b7a6ed7e352679d3af0795dfc8f61727131c00c059ded",
23-
"deps": [
24-
"@io_bazel_rules_scala_scala_compiler",
25-
"@io_bazel_rules_scala_scala_library",
26-
"@io_bazel_rules_scala_scala_reflect",
27-
"@com_lihaoyi_fansi",
28-
],
29-
},
30-
"com_geirsson_metaconfig_typesafe_config": {
31-
"artifact": "com.geirsson:metaconfig-typesafe-config_2.12:0.12.0",
32-
"sha256": "5d4d30072aab5174845cacca85105df2935f9ebe70b6f9d2afd1b85138e42ed9",
33-
"deps": [
34-
"@com_geirsson_metaconfig_core",
35-
"@com_typesafe_config",
36-
"@io_bazel_rules_scala_scala_library",
37-
],
38-
},
399
"com_github_bigwheel_util_backports": {
4010
"artifact": "com.github.bigwheel:util-backports_2.12:2.1",
4111
"sha256": "0d2ae5753bc8ff9f221a52ef39e771d285eccc52b88cdce622212569d3bd0e1b",
@@ -86,10 +56,11 @@ artifacts = {
8656
"sha256": "442db5991a11974d72127353be7d7e7abdf8d943d83b16668cb2e336d7392f54",
8757
},
8858
"com_lihaoyi_fansi": {
89-
"artifact": "com.lihaoyi:fansi_2.12:0.4.0",
90-
"sha256": "505ae9f446d5d5c88f5d9ead8ae930a5ee1335d645cefd96566b8c7af3ff0e8a",
59+
"artifact": "com.lihaoyi:fansi_2.12:0.5.0",
60+
"sha256": "8b87d847d06c65c63d38fe4a8b38a2362f2c643928e665686ecaf35cc184f215",
9161
"deps": [
9262
"@com_lihaoyi_sourcecode",
63+
"@io_bazel_rules_scala_scala_library",
9364
],
9465
},
9566
"com_lihaoyi_fastparse": {
@@ -113,8 +84,8 @@ artifacts = {
11384
"sha256": "973a7198121cc8dac9eeb3f325c93c497fe3b682f68ba56e34c1b210af7b15b3",
11485
},
11586
"com_typesafe_config": {
116-
"artifact": "com.typesafe:config:1.4.1",
117-
"sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f",
87+
"artifact": "com.typesafe:config:1.4.3",
88+
"sha256": "8ada4c185ce72416712d63e0b5afdc5f009c0cdf405e5f26efecdf156aa5dfb6",
11889
},
11990
"dev_dirs_directories": {
12091
"artifact": "dev.dirs:directories:26",
@@ -451,8 +422,8 @@ artifacts = {
451422
],
452423
},
453424
"org_scalameta_common": {
454-
"artifact": "org.scalameta:common_2.12:4.9.9",
455-
"sha256": "8b85032d1fd8cb33c091cf560362b5a9ce5cb507ab38e6968d04f7978d18f600",
425+
"artifact": "org.scalameta:common_2.12:4.12.7",
426+
"sha256": "d216462d8c0bae82c0a885703367ea8d988d0856b38a6a0bcf8887dfebf79225",
456427
"deps": [
457428
"@com_lihaoyi_sourcecode",
458429
"@io_bazel_rules_scala_scala_library",
@@ -475,54 +446,92 @@ artifacts = {
475446
],
476447
},
477448
"org_scalameta_mdoc_parser": {
478-
"artifact": "org.scalameta:mdoc-parser_2.12:2.5.4",
479-
"sha256": "509e2a105e32e39f2f0d0caff8392ee3c6da3899cc9df956beb6db6831da9e45",
449+
"artifact": "org.scalameta:mdoc-parser_2.12:2.6.2",
450+
"sha256": "9de918cbb8f340b1011c7a9dd9218ff33360382f725274b9683f35c2c67ca34e",
451+
"deps": [
452+
"@io_bazel_rules_scala_scala_library",
453+
],
454+
},
455+
"org_scalameta_metaconfig_core": {
456+
"artifact": "org.scalameta:metaconfig-core_2.12:0.14.0",
457+
"sha256": "9b497e0e2f47713ed2a12d3876716a1708e5a251fca364abc707869469d09065",
458+
"deps": [
459+
"@io_bazel_rules_scala_scala_library",
460+
"@io_bazel_rules_scala_scala_reflect",
461+
"@org_scala_lang_modules_scala_collection_compat",
462+
"@org_scalameta_metaconfig_pprint",
463+
"@org_typelevel_paiges_core",
464+
],
465+
},
466+
"org_scalameta_metaconfig_pprint": {
467+
"artifact": "org.scalameta:metaconfig-pprint_2.12:0.14.0",
468+
"sha256": "2377a7dba35569c35334bc3a788136addcf50a23c0d032385298ca56b42193c9",
480469
"deps": [
470+
"@com_lihaoyi_fansi",
471+
"@io_bazel_rules_scala_scala_compiler",
481472
"@io_bazel_rules_scala_scala_library",
473+
"@io_bazel_rules_scala_scala_reflect",
474+
],
475+
},
476+
"org_scalameta_metaconfig_typesafe_config": {
477+
"artifact": "org.scalameta:metaconfig-typesafe-config_2.12:0.14.0",
478+
"sha256": "2988dbae5e39438b538d0cb2dfc897915a15b88e6e80866dc32ba2e9c2d44222",
479+
"deps": [
480+
"@com_typesafe_config",
481+
"@io_bazel_rules_scala_scala_library",
482+
"@org_scalameta_metaconfig_core",
482483
],
483484
},
484485
"org_scalameta_parsers": {
485-
"artifact": "org.scalameta:parsers_2.12:4.9.9",
486-
"sha256": "69ca8f44ead67cc65f8b4973285b7bdb88c4b29542de287a73e23df3a2614da9",
486+
"artifact": "org.scalameta:parsers_2.12:4.12.7",
487+
"sha256": "a30d1481339d8e3516b8a741c235169c8ba324925e343270140c2ae7d454296d",
487488
"deps": [
488489
"@io_bazel_rules_scala_scala_library",
489490
"@org_scalameta_trees",
490491
],
491492
},
492493
"org_scalameta_scalafmt_config": {
493-
"artifact": "org.scalameta:scalafmt-config_2.12:3.8.3",
494-
"sha256": "081d7c88570b82f4769e41912c01687436090dd9cf7158ca5ea248be778647bf",
494+
"artifact": "org.scalameta:scalafmt-config_2.12:3.8.6",
495+
"sha256": "166d8485c4efa4631ca3661022c59004b842001b17d1852f97fb3914ad0eacd5",
495496
"deps": [
496-
"@com_geirsson_metaconfig_core",
497-
"@com_geirsson_metaconfig_typesafe_config",
497+
"@io_bazel_rules_scala_scala_library",
498+
"@org_scalameta_metaconfig_core",
499+
"@org_scalameta_metaconfig_typesafe_config",
498500
],
499501
},
500502
"org_scalameta_scalafmt_core": {
501-
"artifact": "org.scalameta:scalafmt-core_2.12:3.8.3",
502-
"sha256": "27baf247de01ba6270f0717d9b779a4a6bc9989fa01250b2ea59795e345d4f78",
503+
"artifact": "org.scalameta:scalafmt-core_2.12:3.8.6",
504+
"sha256": "61e367c431ef6e783e3d8827630ff2aa78334e2a2a5cc6bd8b6dc3500bd0a84f",
503505
"deps": [
504506
"@io_bazel_rules_scala_scala_library",
505-
"@io_bazel_rules_scala_scala_reflect",
506507
"@org_scalameta_mdoc_parser",
507508
"@org_scalameta_scalafmt_config",
509+
"@org_scalameta_scalafmt_macros",
508510
"@org_scalameta_scalafmt_sysops",
511+
],
512+
},
513+
"org_scalameta_scalafmt_macros": {
514+
"artifact": "org.scalameta:scalafmt-macros_2.12:3.8.6",
515+
"sha256": "8e2d8ef4f5a45a5969f76cdcf80910f5ef90ffb50dbf0a18672d18797d025e37",
516+
"deps": [
517+
"@io_bazel_rules_scala_scala_library",
518+
"@io_bazel_rules_scala_scala_reflect",
509519
"@org_scalameta_scalameta",
510520
],
511521
},
512522
"org_scalameta_scalafmt_sysops": {
513-
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.8.3",
514-
"sha256": "5f0544203bf7a14815fa2d29ee010f5b6a92f794f96c7564688e584f97b56b1d",
523+
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.8.6",
524+
"sha256": "4e1edbf6e06810c3c5d65fd8a6a2e92674a3994acf4fd0f4a643c0a577eb5f4b",
515525
"deps": [
516526
"@com_github_bigwheel_util_backports",
517527
"@io_bazel_rules_scala_scala_library",
518528
],
519529
},
520530
"org_scalameta_scalameta": {
521-
"artifact": "org.scalameta:scalameta_2.12:4.9.9",
522-
"sha256": "0d7bc7ea2186b87c4c2cb117287bbef7bbc601fdf14042475fb7330da2cc73c1",
531+
"artifact": "org.scalameta:scalameta_2.12:4.12.7",
532+
"sha256": "b81fb9bf9f9746f9556b168c9ae8bb3a082c05691dc7fe32c650417f276c6f6c",
523533
"deps": [
524534
"@io_bazel_rules_scala_scala_library",
525-
"@org_scala_lang_scalap",
526535
"@org_scalameta_parsers",
527536
],
528537
},
@@ -534,8 +543,8 @@ artifacts = {
534543
],
535544
},
536545
"org_scalameta_trees": {
537-
"artifact": "org.scalameta:trees_2.12:4.9.9",
538-
"sha256": "786762689490a14a69ad4ab8879f59e858a7ea6a6b498daa302c0eff1450be01",
546+
"artifact": "org.scalameta:trees_2.12:4.12.7",
547+
"sha256": "c9160f5829c23658b7d98f8d28b8298b9d2d12520f23be6eaeb1a25a04c90a34",
539548
"deps": [
540549
"@io_bazel_rules_scala_scala_library",
541550
"@org_scalameta_common",
@@ -568,8 +577,8 @@ artifacts = {
568577
],
569578
},
570579
"org_typelevel_paiges_core": {
571-
"artifact": "org.typelevel:paiges-core_2.12:0.4.3",
572-
"sha256": "ef6f2f33c5ca1df0a63c3f5da240cadb61d25d249fd9411f0f2ac5f6a7de9043",
580+
"artifact": "org.typelevel:paiges-core_2.12:0.4.4",
581+
"sha256": "bffacf6bfc346d4822b2c18e62fb39f18418beeb41f849761ff9ac1c20a9aea9",
573582
"deps": [
574583
"@io_bazel_rules_scala_scala_library",
575584
],

0 commit comments

Comments
 (0)