Skip to content

Commit 78e860f

Browse files
mblandmbland
authored
Bump Scalafmt from 3.8.6 to 3.9.1 (#1708)
Also updates `scripts/create_repository.py` to prevent `scala-collection-compat` versions from flipping on subsequent runs by no longer comparing Scala versions. Part of #1482. Both Scalafmt and ScalaPB depend on `org_scala_lang_modules_scala_collection_compat`. Before removing the Scala version comparison, subsequent `create_repository.py` runs would flip between these two artifacts for Scala 3.3 through 3.6: - `org.scala-lang.modules:scala-collection-compat_2.13:2.13.0` - `org.scala-lang.modules:scala-collection-compat_3:2.12.0` The artifact with the higher release version number is preferable to the artifact with the higher Scala version. The change from `FileOps` to `PlatformFileOps` in `ScalafmtAdapter` is a consequence of an update first included in Scalafmt 3.9.0: - scalameta/scalafmt#4800 - scalameta/scalafmt@0bdbf03
1 parent 04bbcc1 commit 78e860f

File tree

15 files changed

+299
-237
lines changed

15 files changed

+299
-237
lines changed

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.6"
1+
version = "3.9.1"
22
runner.dialect = scala213
33
align.openParenCallSite = false
44
align.openParenDefnSite = false

‎scala/scalafmt/scalafmt/ScalafmtAdapter.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package io.bazel.rules_scala.scalafmt
22

33
import java.io.File
44
import org.scalafmt.config.ScalafmtConfig
5-
import org.scalafmt.sysops.FileOps
5+
import org.scalafmt.sysops.PlatformFileOps
66

77
object ScalafmtAdapter {
88
def readFile(file: File)(implicit codec: scala.io.Codec): String =
9-
FileOps.readFile(file.toPath())(codec)
9+
PlatformFileOps.readFile(file.toPath())(codec)
1010

1111
def parseConfigFile(configFile: File): ScalafmtConfig =
1212
ScalafmtConfig.fromHoconFile(configFile.toPath()).get

‎scala/scalafmt/scalafmt_repositories.bzl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ _SCALAFMT_DEPS_2_11 = [
5454
]
5555

5656
_SCALAFMT_DEPS_2_12 = [
57+
"org_scalameta_io",
5758
"org_scalameta_mdoc_parser",
5859
"org_scalameta_metaconfig_core",
5960
"org_scalameta_metaconfig_pprint",

‎scripts/create_repository.py‎

Lines changed: 2 additions & 5 deletions
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.6"
32+
SCALAFMT_VERSION = "3.9.1"
3333
KIND_PROJECTOR_VERSION = "0.13.3"
3434
PROTOBUF_JAVA_VERSION = "4.29.3"
3535
JLINE_VERSION = '3.29.0'
@@ -253,10 +253,7 @@ def is_newer_than(self, other):
253253
f'Expected {self.group}:{self.artifact}, ' +
254254
f'got {other.group}:{other.artifact}'
255255
)
256-
return (
257-
self.__compare_versions(other.scala_version, self.scala_version) or
258-
self.__compare_versions(other.version, self.version)
259-
)
256+
return self.__compare_versions(other.version, self.version)
260257

261258
def __compare_versions(self, lhs, rhs):
262259
lhs_parts = lhs.split('.')

‎test/scalafmt/.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.6"
1+
version = "3.9.1"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt2.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.6"
1+
version = "3.9.1"
22
runner.dialect = scala213
33
maxColumn = 40
44
lineEndings = preserve

‎test_cross_build/scalafmt/.scalafmt3.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.6"
1+
version = "3.9.1"
22
runner.dialect = scala3
33
maxColumn = 40
44
lineEndings = preserve

‎third_party/repositories/scala_2_12.bzl‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ artifacts = {
408408
"sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92",
409409
},
410410
"org_scala_lang_modules_scala_collection_compat": {
411-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.12.0",
412-
"sha256": "1619c5e4399e1e4793667970aae232652db0549e795c90abf91e44c55ec37cb3",
411+
"artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.13.0",
412+
"sha256": "a0eb3523bf46797afd3ede3e402122fcaf56f661f4721f9058360f4036f17610",
413413
"deps": [
414414
"@io_bazel_rules_scala_scala_library",
415415
],
@@ -422,8 +422,8 @@ artifacts = {
422422
],
423423
},
424424
"org_scalameta_common": {
425-
"artifact": "org.scalameta:common_2.12:4.12.7",
426-
"sha256": "d216462d8c0bae82c0a885703367ea8d988d0856b38a6a0bcf8887dfebf79225",
425+
"artifact": "org.scalameta:common_2.12:4.13.2",
426+
"sha256": "2f71e2591d430fc647e18963ea1af10873ba52f1db9871d016d888377f25e1e4",
427427
"deps": [
428428
"@com_lihaoyi_sourcecode",
429429
"@io_bazel_rules_scala_scala_library",
@@ -445,16 +445,23 @@ artifacts = {
445445
"@io_bazel_rules_scala_scala_library",
446446
],
447447
},
448+
"org_scalameta_io": {
449+
"artifact": "org.scalameta:io_2.12:4.13.2",
450+
"sha256": "7fd6cc4ec9e4638c650cc75f5f6d8a424204191f2d291f43701255c1f0ee0464",
451+
"deps": [
452+
"@io_bazel_rules_scala_scala_library",
453+
],
454+
},
448455
"org_scalameta_mdoc_parser": {
449-
"artifact": "org.scalameta:mdoc-parser_2.12:2.6.2",
450-
"sha256": "9de918cbb8f340b1011c7a9dd9218ff33360382f725274b9683f35c2c67ca34e",
456+
"artifact": "org.scalameta:mdoc-parser_2.12:2.6.4",
457+
"sha256": "11c47b5e44e537adece65377b1cdfe1dde3f70c6d0708f07a4ac173dd79441df",
451458
"deps": [
452459
"@io_bazel_rules_scala_scala_library",
453460
],
454461
},
455462
"org_scalameta_metaconfig_core": {
456-
"artifact": "org.scalameta:metaconfig-core_2.12:0.14.0",
457-
"sha256": "9b497e0e2f47713ed2a12d3876716a1708e5a251fca364abc707869469d09065",
463+
"artifact": "org.scalameta:metaconfig-core_2.12:0.15.0",
464+
"sha256": "9eb67935b7418939274ab9982c20dd5b0f3e660a86ef737cc2621c0a175a8bde",
458465
"deps": [
459466
"@io_bazel_rules_scala_scala_library",
460467
"@io_bazel_rules_scala_scala_reflect",
@@ -464,8 +471,8 @@ artifacts = {
464471
],
465472
},
466473
"org_scalameta_metaconfig_pprint": {
467-
"artifact": "org.scalameta:metaconfig-pprint_2.12:0.14.0",
468-
"sha256": "2377a7dba35569c35334bc3a788136addcf50a23c0d032385298ca56b42193c9",
474+
"artifact": "org.scalameta:metaconfig-pprint_2.12:0.15.0",
475+
"sha256": "6f01efb734218a427c6da72a1b3456e464751025820c8c802eacd3baf7f9a205",
469476
"deps": [
470477
"@com_lihaoyi_fansi",
471478
"@io_bazel_rules_scala_scala_compiler",
@@ -474,34 +481,34 @@ artifacts = {
474481
],
475482
},
476483
"org_scalameta_metaconfig_typesafe_config": {
477-
"artifact": "org.scalameta:metaconfig-typesafe-config_2.12:0.14.0",
478-
"sha256": "2988dbae5e39438b538d0cb2dfc897915a15b88e6e80866dc32ba2e9c2d44222",
484+
"artifact": "org.scalameta:metaconfig-typesafe-config_2.12:0.15.0",
485+
"sha256": "aa53ec43d986af541016590ea3057f5e821a27330708eac00d3a464849564bc7",
479486
"deps": [
480487
"@com_typesafe_config",
481488
"@io_bazel_rules_scala_scala_library",
482489
"@org_scalameta_metaconfig_core",
483490
],
484491
},
485492
"org_scalameta_parsers": {
486-
"artifact": "org.scalameta:parsers_2.12:4.12.7",
487-
"sha256": "a30d1481339d8e3516b8a741c235169c8ba324925e343270140c2ae7d454296d",
493+
"artifact": "org.scalameta:parsers_2.12:4.13.2",
494+
"sha256": "1e5a497f961ee1bbcde1e8d7b8c5c99d45deff5bab143c67ed077bc2a3ef7fe9",
488495
"deps": [
489496
"@io_bazel_rules_scala_scala_library",
490497
"@org_scalameta_trees",
491498
],
492499
},
493500
"org_scalameta_scalafmt_config": {
494-
"artifact": "org.scalameta:scalafmt-config_2.12:3.8.6",
495-
"sha256": "166d8485c4efa4631ca3661022c59004b842001b17d1852f97fb3914ad0eacd5",
501+
"artifact": "org.scalameta:scalafmt-config_2.12:3.9.1",
502+
"sha256": "4864b0544a9a35d79cba98df8b354713678b333bd7031790e7224cb9153efc34",
496503
"deps": [
497504
"@io_bazel_rules_scala_scala_library",
498505
"@org_scalameta_metaconfig_core",
499506
"@org_scalameta_metaconfig_typesafe_config",
500507
],
501508
},
502509
"org_scalameta_scalafmt_core": {
503-
"artifact": "org.scalameta:scalafmt-core_2.12:3.8.6",
504-
"sha256": "61e367c431ef6e783e3d8827630ff2aa78334e2a2a5cc6bd8b6dc3500bd0a84f",
510+
"artifact": "org.scalameta:scalafmt-core_2.12:3.9.1",
511+
"sha256": "1721418c28f4b1e71ec65d2fb8da6aef35142922cd397a4a14422a6015c3f9a1",
505512
"deps": [
506513
"@io_bazel_rules_scala_scala_library",
507514
"@org_scalameta_mdoc_parser",
@@ -511,25 +518,25 @@ artifacts = {
511518
],
512519
},
513520
"org_scalameta_scalafmt_macros": {
514-
"artifact": "org.scalameta:scalafmt-macros_2.12:3.8.6",
515-
"sha256": "8e2d8ef4f5a45a5969f76cdcf80910f5ef90ffb50dbf0a18672d18797d025e37",
521+
"artifact": "org.scalameta:scalafmt-macros_2.12:3.9.1",
522+
"sha256": "0fc1e93bd59844b8f5bba287bf96d47b07df52f2252e61352ab777575290221b",
516523
"deps": [
517524
"@io_bazel_rules_scala_scala_library",
518525
"@io_bazel_rules_scala_scala_reflect",
519526
"@org_scalameta_scalameta",
520527
],
521528
},
522529
"org_scalameta_scalafmt_sysops": {
523-
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.8.6",
524-
"sha256": "4e1edbf6e06810c3c5d65fd8a6a2e92674a3994acf4fd0f4a643c0a577eb5f4b",
530+
"artifact": "org.scalameta:scalafmt-sysops_2.12:3.9.1",
531+
"sha256": "5ce1699ecf9fdd76301dfcac7997d0b2ab479f5b4db21e53d697764b41bc25f9",
525532
"deps": [
526533
"@com_github_bigwheel_util_backports",
527534
"@io_bazel_rules_scala_scala_library",
528535
],
529536
},
530537
"org_scalameta_scalameta": {
531-
"artifact": "org.scalameta:scalameta_2.12:4.12.7",
532-
"sha256": "b81fb9bf9f9746f9556b168c9ae8bb3a082c05691dc7fe32c650417f276c6f6c",
538+
"artifact": "org.scalameta:scalameta_2.12:4.13.2",
539+
"sha256": "3ef4c36ad55d405ddc38a61a09d8460e7565439d4f3d8653bf56f953b3d09ef8",
533540
"deps": [
534541
"@io_bazel_rules_scala_scala_library",
535542
"@org_scalameta_parsers",
@@ -543,11 +550,12 @@ artifacts = {
543550
],
544551
},
545552
"org_scalameta_trees": {
546-
"artifact": "org.scalameta:trees_2.12:4.12.7",
547-
"sha256": "c9160f5829c23658b7d98f8d28b8298b9d2d12520f23be6eaeb1a25a04c90a34",
553+
"artifact": "org.scalameta:trees_2.12:4.13.2",
554+
"sha256": "a690ea3df29be35e28e59be53ffde381a63eb814abd856761bd49ad863a5f921",
548555
"deps": [
549556
"@io_bazel_rules_scala_scala_library",
550557
"@org_scalameta_common",
558+
"@org_scalameta_io",
551559
],
552560
},
553561
"org_springframework_spring_core": {

‎third_party/repositories/scala_2_13.bzl‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ artifacts = {
198198
"sha256": "1ebb2b6f9e4eb4022497c19b1e1e825019c08514f962aaac197145f88ed730f1",
199199
},
200200
"io_bazel_rules_scala_scala_parallel_collections": {
201-
"artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.1.0",
202-
"sha256": "717eee20ce47367a7ad6481ad29084ce6868e42a78babe965d2ec965334749b1",
201+
"artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.2.0",
202+
"sha256": "4eae6e68cf44e9f709970355590ae981883edf6484608d747376a56cbb285432",
203203
"deps": [
204204
"@io_bazel_rules_scala_scala_library",
205205
],
@@ -432,8 +432,8 @@ artifacts = {
432432
"sha256": "99c22a966838ba4291e69a5dd5689afd049500eb9362b23baace731f9c9c97dd",
433433
},
434434
"org_scala_lang_modules_scala_collection_compat": {
435-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
436-
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
435+
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.13.0",
436+
"sha256": "40f141575b57796bf0c1e4b5f0974d91e3a6dee6ecea47ceed62c0efa1298234",
437437
"deps": [
438438
"@io_bazel_rules_scala_scala_library",
439439
],
@@ -446,8 +446,8 @@ artifacts = {
446446
],
447447
},
448448
"org_scalameta_common": {
449-
"artifact": "org.scalameta:common_2.13:4.12.7",
450-
"sha256": "f16c5689d91f6086f03f6e78d368153521c5ff3b4941bda85c69b4e5409e1482",
449+
"artifact": "org.scalameta:common_2.13:4.13.2",
450+
"sha256": "58989114218e701f0799ecf6546d35ebd3a97635a15d4f357b6152bb0770529e",
451451
"deps": [
452452
"@com_lihaoyi_sourcecode",
453453
"@io_bazel_rules_scala_scala_library",
@@ -469,16 +469,23 @@ artifacts = {
469469
"@io_bazel_rules_scala_scala_library",
470470
],
471471
},
472+
"org_scalameta_io": {
473+
"artifact": "org.scalameta:io_2.13:4.13.2",
474+
"sha256": "766e806a3ef41b44f6b9041f3813fe6c2384fa9be5f4406dd093cbbb354568e9",
475+
"deps": [
476+
"@io_bazel_rules_scala_scala_library",
477+
],
478+
},
472479
"org_scalameta_mdoc_parser": {
473-
"artifact": "org.scalameta:mdoc-parser_2.13:2.6.2",
474-
"sha256": "f12618065d4eedba3819b4593e5d0b5c43f69a9662959daee76a8dcf33560836",
480+
"artifact": "org.scalameta:mdoc-parser_2.13:2.6.4",
481+
"sha256": "d1462cf777c227a9a751ae9aae3cb7ab7c3fc1f70689f35eafe58746e33566cc",
475482
"deps": [
476483
"@io_bazel_rules_scala_scala_library",
477484
],
478485
},
479486
"org_scalameta_metaconfig_core": {
480-
"artifact": "org.scalameta:metaconfig-core_2.13:0.14.0",
481-
"sha256": "bb93a43e780ecc30fa97ee07b8969391d2bf7da7882df2f9abf9f328cba8616a",
487+
"artifact": "org.scalameta:metaconfig-core_2.13:0.15.0",
488+
"sha256": "c0b789c2d4468238fc325ef0a17f1a029b3635ff12b510bde03dd577a1281278",
482489
"deps": [
483490
"@io_bazel_rules_scala_scala_library",
484491
"@io_bazel_rules_scala_scala_reflect",
@@ -488,8 +495,8 @@ artifacts = {
488495
],
489496
},
490497
"org_scalameta_metaconfig_pprint": {
491-
"artifact": "org.scalameta:metaconfig-pprint_2.13:0.14.0",
492-
"sha256": "f23dea7d0fd98d585fef21130f9b424a9f75b6c386c88a665dc09ab8b2e09e61",
498+
"artifact": "org.scalameta:metaconfig-pprint_2.13:0.15.0",
499+
"sha256": "357e65682c00db62978f0dd21fea01f13a5f0fb31b45308ad74b136b1ec4f021",
493500
"deps": [
494501
"@com_lihaoyi_fansi",
495502
"@io_bazel_rules_scala_scala_compiler",
@@ -498,34 +505,34 @@ artifacts = {
498505
],
499506
},
500507
"org_scalameta_metaconfig_typesafe_config": {
501-
"artifact": "org.scalameta:metaconfig-typesafe-config_2.13:0.14.0",
502-
"sha256": "f33109d2ec39a762ea8d66b502dc9ef8959d41935c8d8cb4dba1fa4614993383",
508+
"artifact": "org.scalameta:metaconfig-typesafe-config_2.13:0.15.0",
509+
"sha256": "2ae5a8ecba43fb809696e419f1f98739e419534cc25918e2d8949a2d2727327e",
503510
"deps": [
504511
"@com_typesafe_config",
505512
"@io_bazel_rules_scala_scala_library",
506513
"@org_scalameta_metaconfig_core",
507514
],
508515
},
509516
"org_scalameta_parsers": {
510-
"artifact": "org.scalameta:parsers_2.13:4.12.7",
511-
"sha256": "e88ce87f7383a5799bb6a0d13a90c3d633f4d0d74f055e56f81ab6b5e3fc24a7",
517+
"artifact": "org.scalameta:parsers_2.13:4.13.2",
518+
"sha256": "6d3ba3dbcf63b0f1d5068fea822412c5f5152310102099b1f61c94d800b2dec3",
512519
"deps": [
513520
"@io_bazel_rules_scala_scala_library",
514521
"@org_scalameta_trees",
515522
],
516523
},
517524
"org_scalameta_scalafmt_config": {
518-
"artifact": "org.scalameta:scalafmt-config_2.13:3.8.6",
519-
"sha256": "a6b93de140cf501aac45ccbd04e8a2074616d68b938062618fbaf21b7d339c0f",
525+
"artifact": "org.scalameta:scalafmt-config_2.13:3.9.1",
526+
"sha256": "f543f1076717e6e8b96cc0149a08b3fc09e7e746c651f0dfadf64d33f3ba334a",
520527
"deps": [
521528
"@io_bazel_rules_scala_scala_library",
522529
"@org_scalameta_metaconfig_core",
523530
"@org_scalameta_metaconfig_typesafe_config",
524531
],
525532
},
526533
"org_scalameta_scalafmt_core": {
527-
"artifact": "org.scalameta:scalafmt-core_2.13:3.8.6",
528-
"sha256": "26a5797dcb20d16a0b7d524757913a8e51234db8a3a04e7858de51c80919aee1",
534+
"artifact": "org.scalameta:scalafmt-core_2.13:3.9.1",
535+
"sha256": "99612ddaf548a46c0beba1881b30c36340d0580252c966a95cccf0cfc464d6d9",
529536
"deps": [
530537
"@io_bazel_rules_scala_scala_library",
531538
"@org_scalameta_mdoc_parser",
@@ -535,25 +542,25 @@ artifacts = {
535542
],
536543
},
537544
"org_scalameta_scalafmt_macros": {
538-
"artifact": "org.scalameta:scalafmt-macros_2.13:3.8.6",
539-
"sha256": "b04ab3452868f23a09abae7935b5d52e10c747dcc7e9b972cab358d2031e23e7",
545+
"artifact": "org.scalameta:scalafmt-macros_2.13:3.9.1",
546+
"sha256": "1bd711d82ca30e4861c0f2849e32135967c63af2aa19cefd117df131119fc506",
540547
"deps": [
541548
"@io_bazel_rules_scala_scala_library",
542549
"@io_bazel_rules_scala_scala_reflect",
543550
"@org_scalameta_scalameta",
544551
],
545552
},
546553
"org_scalameta_scalafmt_sysops": {
547-
"artifact": "org.scalameta:scalafmt-sysops_2.13:3.8.6",
548-
"sha256": "e82444ad3a5a1798016640de02035b3e9a6eb413beec1333a381924c58057f88",
554+
"artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.1",
555+
"sha256": "86725f4905f2e090ebbadb16b4897e098d3d2dec9f003d9acbfc791b078e48d0",
549556
"deps": [
550557
"@io_bazel_rules_scala_scala_library",
551558
"@io_bazel_rules_scala_scala_parallel_collections",
552559
],
553560
},
554561
"org_scalameta_scalameta": {
555-
"artifact": "org.scalameta:scalameta_2.13:4.12.7",
556-
"sha256": "e39cfbc8c39ffec5a5a4ada4561088f265b14c3f7bd6f220b93776d06ab21a0d",
562+
"artifact": "org.scalameta:scalameta_2.13:4.13.2",
563+
"sha256": "b56df246d06c2a044de0e3d1bcd53ee883331ca116bb4654fdad50d062ec6646",
557564
"deps": [
558565
"@io_bazel_rules_scala_scala_library",
559566
"@org_scalameta_parsers",
@@ -567,11 +574,12 @@ artifacts = {
567574
],
568575
},
569576
"org_scalameta_trees": {
570-
"artifact": "org.scalameta:trees_2.13:4.12.7",
571-
"sha256": "2e8100be7aa7e6a16538444b00e8c95247eb2b743035a7363cfa675b7142edaa",
577+
"artifact": "org.scalameta:trees_2.13:4.13.2",
578+
"sha256": "c9fde64b53db432789b55ea424653349f735c6d7640724d5547ddbd407d49bb0",
572579
"deps": [
573580
"@io_bazel_rules_scala_scala_library",
574581
"@org_scalameta_common",
582+
"@org_scalameta_io",
575583
],
576584
},
577585
"org_springframework_spring_core": {

0 commit comments

Comments
 (0)