Skip to content

Commit d1c6f86

Browse files
mblandmbland
committed
Use ScalaPB *_3 artifacts for Scala >= 3.3
The previous error occurred because the `scala_proto` worker was using `protoc-bridge_3` with other ScalaPB artifacts using `*_2.13` versions. Bumping the rest of these artifacts to `*_3` versions fixed the problem.
1 parent 317f993 commit d1c6f86

File tree

5 files changed

+78
-78
lines changed

5 files changed

+78
-78
lines changed

‎scripts/create_repository.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]:
7878
scala_2_version = scala_version
7979
scala_2_major = scala_major
8080
scalatest_major = scala_major
81-
protoc_bridge_major = scala_2_major
81+
scalapb_major = scala_2_major
8282

8383
if is_scala_3:
8484
scala_2_version = max_scala_2_version
8585
scala_2_major = max_scala_2_major
8686
scalatest_major = '3'
87-
protoc_bridge_major = max_scala_2_major if minor_version < 3 else '3'
87+
scalapb_major = max_scala_2_major if minor_version < 3 else '3'
8888

8989
scalafmt_version = SCALAFMT_VERSION
9090
scalapb_version = SCALAPB_VERSION
@@ -100,13 +100,13 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]:
100100
GRPC_COMMON_PROTOS_VERSION,
101101
f'com.google.guava:guava:{GUAVA_VERSION}',
102102
f'com.google.protobuf:protobuf-java:{PROTOBUF_JAVA_VERSION}',
103-
f'com.thesamet.scalapb:compilerplugin_{scala_2_major}:' +
103+
f'com.thesamet.scalapb:compilerplugin_{scalapb_major}:' +
104104
scalapb_version,
105-
f'com.thesamet.scalapb:protoc-bridge_{protoc_bridge_major}:' +
105+
f'com.thesamet.scalapb:protoc-bridge_{scalapb_major}:' +
106106
protoc_bridge_version,
107-
f'com.thesamet.scalapb:scalapb-runtime_{scala_2_major}:' +
107+
f'com.thesamet.scalapb:scalapb-runtime_{scalapb_major}:' +
108108
scalapb_version,
109-
f'com.thesamet.scalapb:scalapb-runtime-grpc_{scala_2_major}:' +
109+
f'com.thesamet.scalapb:scalapb-runtime-grpc_{scalapb_major}:' +
110110
scalapb_version,
111111
f'org.scala-lang.modules:scala-parser-combinators_{scala_2_major}:' +
112112
PARSER_COMBINATORS_VERSION,

‎third_party/repositories/scala_3_3.bzl

+18-18
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ artifacts = {
497497
],
498498
},
499499
"org_scala_lang_modules_scala_collection_compat": {
500-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
501-
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
500+
"artifact": "org.scala-lang.modules:scala-collection-compat_3:2.12.0",
501+
"sha256": "af81a8bc7d85d2e02ad4448a83ed5f9fe08f64e3d47ca9c050a8c33e19aa4018",
502502
"deps": [
503-
"@io_bazel_rules_scala_scala_library_2",
503+
"@io_bazel_rules_scala_scala_library",
504504
],
505505
},
506506
"org_scala_lang_scalap": {
@@ -862,29 +862,29 @@ artifacts = {
862862
],
863863
},
864864
"scala_proto_rules_scalapb_compilerplugin": {
865-
"artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17",
866-
"sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7",
865+
"artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17",
866+
"sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92",
867867
"deps": [
868868
"@com_google_protobuf_protobuf_java",
869-
"@io_bazel_rules_scala_scala_library_2",
869+
"@io_bazel_rules_scala_scala_library",
870870
"@org_scala_lang_modules_scala_collection_compat",
871871
"@scala_proto_rules_scalapb_protoc_gen",
872872
],
873873
},
874874
"scala_proto_rules_scalapb_lenses": {
875-
"artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17",
876-
"sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
875+
"artifact": "com.thesamet.scalapb:lenses_3:0.11.17",
876+
"sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366",
877877
"deps": [
878-
"@io_bazel_rules_scala_scala_library_2",
878+
"@io_bazel_rules_scala_scala_library",
879879
"@org_scala_lang_modules_scala_collection_compat",
880880
],
881881
},
882882
"scala_proto_rules_scalapb_protoc_bridge": {
883-
"artifact": "com.thesamet.scalapb:protoc-bridge_3:0.9.8",
884-
"sha256": "6e1e38e34f3aaa14c6d46defb66b819f03edbdc4d69965011955da2a4781df9c",
883+
"artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7",
884+
"sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5",
885885
"deps": [
886886
"@dev_dirs_directories",
887-
"@io_bazel_rules_scala_scala_library",
887+
"@io_bazel_rules_scala_scala_library_2",
888888
],
889889
},
890890
"scala_proto_rules_scalapb_protoc_gen": {
@@ -896,20 +896,20 @@ artifacts = {
896896
],
897897
},
898898
"scala_proto_rules_scalapb_runtime": {
899-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17",
900-
"sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
899+
"artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17",
900+
"sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a",
901901
"deps": [
902902
"@com_google_protobuf_protobuf_java",
903-
"@io_bazel_rules_scala_scala_library_2",
903+
"@io_bazel_rules_scala_scala_library",
904904
"@org_scala_lang_modules_scala_collection_compat",
905905
"@scala_proto_rules_scalapb_lenses",
906906
],
907907
},
908908
"scala_proto_rules_scalapb_runtime_grpc": {
909-
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17",
910-
"sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0",
909+
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17",
910+
"sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e",
911911
"deps": [
912-
"@io_bazel_rules_scala_scala_library_2",
912+
"@io_bazel_rules_scala_scala_library",
913913
"@org_scala_lang_modules_scala_collection_compat",
914914
"@scala_proto_rules_grpc_protobuf",
915915
"@scala_proto_rules_grpc_stub",

‎third_party/repositories/scala_3_4.bzl

+18-18
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ artifacts = {
497497
],
498498
},
499499
"org_scala_lang_modules_scala_collection_compat": {
500-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
501-
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
500+
"artifact": "org.scala-lang.modules:scala-collection-compat_3:2.12.0",
501+
"sha256": "af81a8bc7d85d2e02ad4448a83ed5f9fe08f64e3d47ca9c050a8c33e19aa4018",
502502
"deps": [
503-
"@io_bazel_rules_scala_scala_library_2",
503+
"@io_bazel_rules_scala_scala_library",
504504
],
505505
},
506506
"org_scala_lang_scalap": {
@@ -862,29 +862,29 @@ artifacts = {
862862
],
863863
},
864864
"scala_proto_rules_scalapb_compilerplugin": {
865-
"artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17",
866-
"sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7",
865+
"artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17",
866+
"sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92",
867867
"deps": [
868868
"@com_google_protobuf_protobuf_java",
869-
"@io_bazel_rules_scala_scala_library_2",
869+
"@io_bazel_rules_scala_scala_library",
870870
"@org_scala_lang_modules_scala_collection_compat",
871871
"@scala_proto_rules_scalapb_protoc_gen",
872872
],
873873
},
874874
"scala_proto_rules_scalapb_lenses": {
875-
"artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17",
876-
"sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
875+
"artifact": "com.thesamet.scalapb:lenses_3:0.11.17",
876+
"sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366",
877877
"deps": [
878-
"@io_bazel_rules_scala_scala_library_2",
878+
"@io_bazel_rules_scala_scala_library",
879879
"@org_scala_lang_modules_scala_collection_compat",
880880
],
881881
},
882882
"scala_proto_rules_scalapb_protoc_bridge": {
883-
"artifact": "com.thesamet.scalapb:protoc-bridge_3:0.9.8",
884-
"sha256": "6e1e38e34f3aaa14c6d46defb66b819f03edbdc4d69965011955da2a4781df9c",
883+
"artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7",
884+
"sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5",
885885
"deps": [
886886
"@dev_dirs_directories",
887-
"@io_bazel_rules_scala_scala_library",
887+
"@io_bazel_rules_scala_scala_library_2",
888888
],
889889
},
890890
"scala_proto_rules_scalapb_protoc_gen": {
@@ -896,20 +896,20 @@ artifacts = {
896896
],
897897
},
898898
"scala_proto_rules_scalapb_runtime": {
899-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17",
900-
"sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
899+
"artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17",
900+
"sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a",
901901
"deps": [
902902
"@com_google_protobuf_protobuf_java",
903-
"@io_bazel_rules_scala_scala_library_2",
903+
"@io_bazel_rules_scala_scala_library",
904904
"@org_scala_lang_modules_scala_collection_compat",
905905
"@scala_proto_rules_scalapb_lenses",
906906
],
907907
},
908908
"scala_proto_rules_scalapb_runtime_grpc": {
909-
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17",
910-
"sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0",
909+
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17",
910+
"sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e",
911911
"deps": [
912-
"@io_bazel_rules_scala_scala_library_2",
912+
"@io_bazel_rules_scala_scala_library",
913913
"@org_scala_lang_modules_scala_collection_compat",
914914
"@scala_proto_rules_grpc_protobuf",
915915
"@scala_proto_rules_grpc_stub",

‎third_party/repositories/scala_3_5.bzl

+18-18
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ artifacts = {
497497
],
498498
},
499499
"org_scala_lang_modules_scala_collection_compat": {
500-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
501-
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
500+
"artifact": "org.scala-lang.modules:scala-collection-compat_3:2.12.0",
501+
"sha256": "af81a8bc7d85d2e02ad4448a83ed5f9fe08f64e3d47ca9c050a8c33e19aa4018",
502502
"deps": [
503-
"@io_bazel_rules_scala_scala_library_2",
503+
"@io_bazel_rules_scala_scala_library",
504504
],
505505
},
506506
"org_scala_lang_scalap": {
@@ -862,29 +862,29 @@ artifacts = {
862862
],
863863
},
864864
"scala_proto_rules_scalapb_compilerplugin": {
865-
"artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17",
866-
"sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7",
865+
"artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17",
866+
"sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92",
867867
"deps": [
868868
"@com_google_protobuf_protobuf_java",
869-
"@io_bazel_rules_scala_scala_library_2",
869+
"@io_bazel_rules_scala_scala_library",
870870
"@org_scala_lang_modules_scala_collection_compat",
871871
"@scala_proto_rules_scalapb_protoc_gen",
872872
],
873873
},
874874
"scala_proto_rules_scalapb_lenses": {
875-
"artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17",
876-
"sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
875+
"artifact": "com.thesamet.scalapb:lenses_3:0.11.17",
876+
"sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366",
877877
"deps": [
878-
"@io_bazel_rules_scala_scala_library_2",
878+
"@io_bazel_rules_scala_scala_library",
879879
"@org_scala_lang_modules_scala_collection_compat",
880880
],
881881
},
882882
"scala_proto_rules_scalapb_protoc_bridge": {
883-
"artifact": "com.thesamet.scalapb:protoc-bridge_3:0.9.8",
884-
"sha256": "6e1e38e34f3aaa14c6d46defb66b819f03edbdc4d69965011955da2a4781df9c",
883+
"artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7",
884+
"sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5",
885885
"deps": [
886886
"@dev_dirs_directories",
887-
"@io_bazel_rules_scala_scala_library",
887+
"@io_bazel_rules_scala_scala_library_2",
888888
],
889889
},
890890
"scala_proto_rules_scalapb_protoc_gen": {
@@ -896,20 +896,20 @@ artifacts = {
896896
],
897897
},
898898
"scala_proto_rules_scalapb_runtime": {
899-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17",
900-
"sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
899+
"artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17",
900+
"sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a",
901901
"deps": [
902902
"@com_google_protobuf_protobuf_java",
903-
"@io_bazel_rules_scala_scala_library_2",
903+
"@io_bazel_rules_scala_scala_library",
904904
"@org_scala_lang_modules_scala_collection_compat",
905905
"@scala_proto_rules_scalapb_lenses",
906906
],
907907
},
908908
"scala_proto_rules_scalapb_runtime_grpc": {
909-
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17",
910-
"sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0",
909+
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17",
910+
"sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e",
911911
"deps": [
912-
"@io_bazel_rules_scala_scala_library_2",
912+
"@io_bazel_rules_scala_scala_library",
913913
"@org_scala_lang_modules_scala_collection_compat",
914914
"@scala_proto_rules_grpc_protobuf",
915915
"@scala_proto_rules_grpc_stub",

‎third_party/repositories/scala_3_6.bzl

+18-18
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ artifacts = {
506506
],
507507
},
508508
"org_scala_lang_modules_scala_collection_compat": {
509-
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
510-
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
509+
"artifact": "org.scala-lang.modules:scala-collection-compat_3:2.12.0",
510+
"sha256": "af81a8bc7d85d2e02ad4448a83ed5f9fe08f64e3d47ca9c050a8c33e19aa4018",
511511
"deps": [
512-
"@io_bazel_rules_scala_scala_library_2",
512+
"@io_bazel_rules_scala_scala_library",
513513
],
514514
},
515515
"org_scala_lang_scalap": {
@@ -871,29 +871,29 @@ artifacts = {
871871
],
872872
},
873873
"scala_proto_rules_scalapb_compilerplugin": {
874-
"artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17",
875-
"sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7",
874+
"artifact": "com.thesamet.scalapb:compilerplugin_3:0.11.17",
875+
"sha256": "ed057718a1d2352288dfa01b643a9f03b7cc3e141939c43f39a9025c21685e92",
876876
"deps": [
877877
"@com_google_protobuf_protobuf_java",
878-
"@io_bazel_rules_scala_scala_library_2",
878+
"@io_bazel_rules_scala_scala_library",
879879
"@org_scala_lang_modules_scala_collection_compat",
880880
"@scala_proto_rules_scalapb_protoc_gen",
881881
],
882882
},
883883
"scala_proto_rules_scalapb_lenses": {
884-
"artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17",
885-
"sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf",
884+
"artifact": "com.thesamet.scalapb:lenses_3:0.11.17",
885+
"sha256": "e887e38b7d0f713fc849a40c33cbeee088bf28a43a35b6d58292b5e0d9889366",
886886
"deps": [
887-
"@io_bazel_rules_scala_scala_library_2",
887+
"@io_bazel_rules_scala_scala_library",
888888
"@org_scala_lang_modules_scala_collection_compat",
889889
],
890890
},
891891
"scala_proto_rules_scalapb_protoc_bridge": {
892-
"artifact": "com.thesamet.scalapb:protoc-bridge_3:0.9.8",
893-
"sha256": "6e1e38e34f3aaa14c6d46defb66b819f03edbdc4d69965011955da2a4781df9c",
892+
"artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7",
893+
"sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5",
894894
"deps": [
895895
"@dev_dirs_directories",
896-
"@io_bazel_rules_scala_scala_library",
896+
"@io_bazel_rules_scala_scala_library_2",
897897
],
898898
},
899899
"scala_proto_rules_scalapb_protoc_gen": {
@@ -905,20 +905,20 @@ artifacts = {
905905
],
906906
},
907907
"scala_proto_rules_scalapb_runtime": {
908-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17",
909-
"sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077",
908+
"artifact": "com.thesamet.scalapb:scalapb-runtime_3:0.11.17",
909+
"sha256": "8253f9ad2c1fa908f8eb4a90ed0980c81c950142d15433d770ebcc36ea17447a",
910910
"deps": [
911911
"@com_google_protobuf_protobuf_java",
912-
"@io_bazel_rules_scala_scala_library_2",
912+
"@io_bazel_rules_scala_scala_library",
913913
"@org_scala_lang_modules_scala_collection_compat",
914914
"@scala_proto_rules_scalapb_lenses",
915915
],
916916
},
917917
"scala_proto_rules_scalapb_runtime_grpc": {
918-
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17",
919-
"sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0",
918+
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_3:0.11.17",
919+
"sha256": "218bd015f897391d6c6d34b96c808d4fc7c732c1674157698a2574e32a7e4a7e",
920920
"deps": [
921-
"@io_bazel_rules_scala_scala_library_2",
921+
"@io_bazel_rules_scala_scala_library",
922922
"@org_scala_lang_modules_scala_collection_compat",
923923
"@scala_proto_rules_grpc_protobuf",
924924
"@scala_proto_rules_grpc_stub",

0 commit comments

Comments
 (0)