Skip to content

Commit 24848c1

Browse files
WojciechMazurWojciechMazur
committed
Update latest Scala 2 and Scala 3 versions
1 parent 8f69486 commit 24848c1

File tree

5 files changed

+53
-50
lines changed

5 files changed

+53
-50
lines changed

‎scripts/create_repository.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import glob
1313
import os
1414

15-
root_scala_versions = ["2.11.12", "2.12.19", "2.13.14", "3.1.3", "3.2.2", "3.3.3", "3.4.3", "3.5.0"]
15+
root_scala_versions = ["2.11.12", "2.12.20", "2.13.15", "3.1.3", "3.2.2", "3.3.4", "3.4.3", "3.5.2"]
1616
scala_test_version = "3.2.9"
1717
scala_fmt_version = "3.0.0"
1818

@@ -33,7 +33,7 @@ def select_root_artifacts(scala_version) -> List[str]:
3333
scala_major = ".".join(scala_version.split(".")[:2])
3434
scala_test_major = "3" if scala_major >= "3.0" else scala_major
3535
scala_fmt_major = "2.13" if scala_major >= "3.0" else scala_major
36-
kind_projector_version = "0.13.2" if scala_major < "2.13" else "0.13.3"
36+
kind_projector_version = "0.13.2" if scala_major < "2.12" else "0.13.3"
3737

3838
common_root_artifacts = [
3939
f"org.scalatest:scalatest_{scala_test_major}:{scala_test_version}",
@@ -104,7 +104,9 @@ def map_to_resolved_artifacts(output) -> List[ResolvedArtifact]:
104104

105105
def resolve_artifacts_with_checksums_and_direct_dependencies(root_artifacts) -> List[ResolvedArtifact]:
106106
command = f'cs resolve {' '.join(root_artifacts)}'
107-
output = subprocess.run(command, capture_output=True, text=True, shell=True).stdout.splitlines()
107+
proc = subprocess.run(command, capture_output=True, text=True, shell=True)
108+
print(proc.stderr)
109+
output = proc.stdout.splitlines()
108110
return map_to_resolved_artifacts(output)
109111

110112
def to_rules_scala_compatible_dict(artifacts, version) -> Dict[str, Dict]:

‎third_party/repositories/scala_2_12.bzl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
scala_version = "2.12.19"
1+
scala_version = "2.12.20"
22

33
artifacts = {
44
"io_bazel_rules_scala_scala_library": {
5-
"artifact": "org.scala-lang:scala-library:2.12.19",
6-
"sha256": "81e32f8e31236ef84c21287f1fbaa916fc6525b2e63220d4a0f2396e91871d50",
5+
"artifact": "org.scala-lang:scala-library:2.12.20",
6+
"sha256": "4d8a8f984cce31a329a24f10b0bf336f042cb62aeb435290a1b20243154cfccb",
77
},
88
"io_bazel_rules_scala_scala_compiler": {
9-
"artifact": "org.scala-lang:scala-compiler:2.12.19",
10-
"sha256": "d12975f4cf9a450ea12870243648a851f92165448fdda5a292747cb3bdaecc4f",
9+
"artifact": "org.scala-lang:scala-compiler:2.12.20",
10+
"sha256": "c88676d75c69721b717ea6c441ece04fff262abab9d210a2936abc2be3731fa2",
1111
"deps": [
1212
"@io_bazel_rules_scala_scala_xml",
1313
"@io_bazel_rules_scala_scala_library",
1414
"@io_bazel_rules_scala_scala_reflect",
1515
],
1616
},
1717
"io_bazel_rules_scala_scala_reflect": {
18-
"artifact": "org.scala-lang:scala-reflect:2.12.19",
19-
"sha256": "ff6eaa5548779d61d35b98cb25e931951c5a9f1abc48741e9df95324ee2ae66c",
18+
"artifact": "org.scala-lang:scala-reflect:2.12.20",
19+
"sha256": "5f1914cdc7a70580ea6038d929ebb25736ecf2234f677e2d47f8a4b2bc81e1fb",
2020
"deps": [
2121
"@io_bazel_rules_scala_scala_library",
2222
],
@@ -134,8 +134,8 @@ artifacts = {
134134
],
135135
},
136136
"io_bazel_rules_scala_scala_xml": {
137-
"artifact": "org.scala-lang.modules:scala-xml_2.12:2.2.0",
138-
"sha256": "fd92f78b7acfea72999aceba5b377a000f42f9296d3d98224c9b1c471815582f",
137+
"artifact": "org.scala-lang.modules:scala-xml_2.12:2.3.0",
138+
"sha256": "4932c56a2d5aae77ae8d7ac6bed1f21d48268fdbac8b4e5f3ca5196ad10fd93e",
139139
"deps": [
140140
"@io_bazel_rules_scala_scala_library",
141141
],
@@ -153,8 +153,8 @@ artifacts = {
153153
],
154154
},
155155
"org_scalameta_semanticdb_scalac": {
156-
"artifact": "org.scalameta:semanticdb-scalac_2.12.19:4.9.9",
157-
"sha256": "566a6b2c38100df99e7f3cf911a965556f3055e28ebb3caea04cef23eb7307d0",
156+
"artifact": "org.scalameta:semanticdb-scalac_2.12.20:4.9.9",
157+
"sha256": "7f0e44262b2b1003668f2f51eb0f978ed5a4b94f734e3a6138ce9d7d1a40fc83",
158158
"deps": [
159159
"@io_bazel_rules_scala_scala_library",
160160
],
@@ -581,8 +581,8 @@ artifacts = {
581581
},
582582
"org_typelevel_kind_projector": {
583583
"testonly": True,
584-
"artifact": "org.typelevel:kind-projector_2.12.19:0.13.2",
585-
"sha256": "7d4e821b86647c65546c1e3667348e8168c5907e9d4b277cc2badedcd479be44",
584+
"artifact": "org.typelevel:kind-projector_2.12.20:0.13.3",
585+
"sha256": "98a53122dedd51f79f23ae03eae3258a2e5dbd51c647eaea4942f98c55b052d1",
586586
"deps": [
587587
"@io_bazel_rules_scala_scala_compiler",
588588
"@io_bazel_rules_scala_scala_library",

‎third_party/repositories/scala_2_13.bzl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
scala_version = "2.13.14"
1+
scala_version = "2.13.15"
22

33
artifacts = {
44
"io_bazel_rules_scala_scala_library": {
5-
"artifact": "org.scala-lang:scala-library:2.13.14",
6-
"sha256": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3",
5+
"artifact": "org.scala-lang:scala-library:2.13.15",
6+
"sha256": "8e4dbc3becf70d59c787118f6ad06fab6790136a0699cd6412bc9da3d336944e",
77
},
88
"io_bazel_rules_scala_scala_compiler": {
9-
"artifact": "org.scala-lang:scala-compiler:2.13.14",
10-
"sha256": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6",
9+
"artifact": "org.scala-lang:scala-compiler:2.13.15",
10+
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
1111
"deps": [
1212
"@io_bazel_rules_scala_scala_library",
1313
"@io_bazel_rules_scala_scala_reflect",
1414
],
1515
},
1616
"io_bazel_rules_scala_scala_reflect": {
17-
"artifact": "org.scala-lang:scala-reflect:2.13.14",
18-
"sha256": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926",
17+
"artifact": "org.scala-lang:scala-reflect:2.13.15",
18+
"sha256": "78d0cc350e1ee42d87c6e11cf5b0dc7bf0b70829c00aa38f27bfb019d439dc11",
1919
"deps": [
2020
"@io_bazel_rules_scala_scala_library",
2121
],
@@ -159,8 +159,8 @@ artifacts = {
159159
],
160160
},
161161
"org_scalameta_semanticdb_scalac": {
162-
"artifact": "org.scalameta:semanticdb-scalac_2.13.14:4.9.9",
163-
"sha256": "c5269b5b7264fc5082357acdb4d9cf6790f49b4195f127878bd4f46659e3c52b",
162+
"artifact": "org.scalameta:semanticdb-scalac_2.13.15:4.9.9",
163+
"sha256": "409194fee7eeb3da25733f6fc0c2d62b9ef53ddecdc50b6c922fdc695b250fe7",
164164
"deps": [
165165
"@io_bazel_rules_scala_scala_library",
166166
],
@@ -588,7 +588,7 @@ artifacts = {
588588
},
589589
"org_typelevel_kind_projector": {
590590
"testonly": True,
591-
"artifact": "org.typelevel:kind-projector_2.13.14:0.13.3",
591+
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
592592
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
593593
"deps": [
594594
"@io_bazel_rules_scala_scala_compiler",

‎third_party/repositories/scala_3_3.bzl

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
1-
scala_version = "3.3.3"
1+
scala_version = "3.3.4"
22

33
artifacts = {
44
"io_bazel_rules_scala_scala_library_2": {
55
"artifact": "org.scala-lang:scala-library:2.13.12",
66
"sha256": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1",
77
},
88
"io_bazel_rules_scala_scala_library": {
9-
"artifact": "org.scala-lang:scala3-library_3:3.3.3",
10-
"sha256": "16fe064f1373ed6f098d3d9f812a398ed5075db4bf2721c04e630502cb352816",
9+
"artifact": "org.scala-lang:scala3-library_3:3.3.4",
10+
"sha256": "d95184acfcd814da2e051378e4962c653f4b468f4086452ab427af030482bd3c",
1111
"deps": [
1212
"@io_bazel_rules_scala_scala_library_2",
1313
],
1414
},
1515
"io_bazel_rules_scala_scala_compiler": {
16-
"artifact": "org.scala-lang:scala3-compiler_3:3.3.3",
17-
"sha256": "f22bd99272f7634919b926f778be19a447e7d0c1e96e5b8ab460f287cffe1f5c",
16+
"artifact": "org.scala-lang:scala3-compiler_3:3.3.4",
17+
"sha256": "2cca65fdb92e2cc393786cae61b4f7bcb9032ad4be61f9cebae1dca72997e52f",
1818
"deps": [
1919
"@io_bazel_rules_scala_scala_asm",
20+
"@org_scala_sbt_compiler_interface",
2021
],
2122
},
2223
"io_bazel_rules_scala_scala_interfaces": {
23-
"artifact": "org.scala-lang:scala3-interfaces:3.3.3",
24-
"sha256": "9d85768663a1894eb9c7cfb73befe16eca760d536eed441f6660a5b8e8dc0c6a",
24+
"artifact": "org.scala-lang:scala3-interfaces:3.3.4",
25+
"sha256": "fe056c10a217353e14aa62076d2bbd957ebd82e02fb445ca5546ae8ea9d40caa",
2526
},
2627
"io_bazel_rules_scala_scala_tasty_core": {
27-
"artifact": "org.scala-lang:tasty-core_3:3.3.3",
28-
"sha256": "a126a3a76022beeb9133e7a7400b81a5ce6910f7866cc5e84fa8133ca90784a5",
28+
"artifact": "org.scala-lang:tasty-core_3:3.3.4",
29+
"sha256": "13d44693d6f2d38e0595954d11234c0373d6d0e689a8151b06878c5b631d57d5",
2930
},
3031
"io_bazel_rules_scala_scala_asm": {
31-
"artifact": "org.scala-lang.modules:scala-asm:9.5.0-scala-1",
32-
"sha256": "fa582f7352f5ee5c244d7fe93c2a1d95dada2d281e1af9a535f0b5153c75088c",
32+
"artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1",
33+
"sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12",
3334
},
3435
"io_bazel_rules_scala_scala_parallel_collections": {
3536
"artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3",
@@ -143,8 +144,8 @@ artifacts = {
143144
],
144145
},
145146
"org_scala_sbt_compiler_interface": {
146-
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
147-
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
147+
"artifact": "org.scala-sbt:compiler-interface:1.9.6",
148+
"sha256": "b986ad1cfcef14c8abeaa3e788df28be9150acfbf587b5f7aa92c1b043c4fa8d",
148149
},
149150
"org_scalameta_fastparse": {
150151
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",

‎third_party/repositories/scala_3_5.bzl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
scala_version = "3.5.0"
1+
scala_version = "3.5.2"
22

33
artifacts = {
44
"io_bazel_rules_scala_scala_library_2": {
55
"artifact": "org.scala-lang:scala-library:2.13.12",
66
"sha256": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1",
77
},
88
"io_bazel_rules_scala_scala_library": {
9-
"artifact": "org.scala-lang:scala3-library_3:3.5.0",
10-
"sha256": "242c9a005b356c9554c6e5f33c2b40eb015f62755e1ea5c5613d80c488d40860",
9+
"artifact": "org.scala-lang:scala3-library_3:3.5.2",
10+
"sha256": "3d1117bb660d3721d2a01345e064d96fd6eca5e7a4e574eecaa409c064432cba",
1111
"deps": [
1212
"@io_bazel_rules_scala_scala_library_2",
1313
],
1414
},
1515
"io_bazel_rules_scala_scala_compiler": {
16-
"artifact": "org.scala-lang:scala3-compiler_3:3.5.0",
17-
"sha256": "54842fab4554c10d857b5617a7855107c8b0134a49d298c6b4e2d9f1584e7049",
16+
"artifact": "org.scala-lang:scala3-compiler_3:3.5.2",
17+
"sha256": "ba6b31f2d63048d5e4bac45facf42811da2093ae60e90932ab72778e439243b2",
1818
"deps": [
1919
"@io_bazel_rules_scala_scala_asm",
2020
"@org_scala_sbt_compiler_interface",
2121
],
2222
},
2323
"io_bazel_rules_scala_scala_interfaces": {
24-
"artifact": "org.scala-lang:scala3-interfaces:3.5.0",
25-
"sha256": "2cb0d101eef1d9d21e74177d419dfaa8e84515ab0a07f6c5f650d61d22e3c9cb",
24+
"artifact": "org.scala-lang:scala3-interfaces:3.5.2",
25+
"sha256": "36bb7c369bfd245dce403c886e1f004a574d0b7935d50cf5a9bf6ddefd1d2b0e",
2626
},
2727
"io_bazel_rules_scala_scala_tasty_core": {
28-
"artifact": "org.scala-lang:tasty-core_3:3.5.0",
29-
"sha256": "47e8323b16b4b76e49d4dd3756e53b1fefebea91a5624ac20bf045cefd211904",
28+
"artifact": "org.scala-lang:tasty-core_3:3.5.2",
29+
"sha256": "b380158748e147f4e44654ad16003c89599ddd456eac29f9686cb6d5515067f3",
3030
},
3131
"io_bazel_rules_scala_scala_asm": {
32-
"artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1",
33-
"sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12",
32+
"artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
33+
"sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
3434
},
3535
"io_bazel_rules_scala_scala_parallel_collections": {
3636
"artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3",

0 commit comments

Comments
 (0)