Skip to content

Commit 86dc099

Browse files
mblandmbland
committed
Bump to protobuf v30.0 and grpc 1.71.0
- `grpc`: 1.70.0 => 1.71.1 - `protobuf-java`: 4.29.3 => 4.30.0 - `protobuf`: v29.3 => v30.0
1 parent 3615365 commit 86dc099

File tree

13 files changed

+178
-167
lines changed

13 files changed

+178
-167
lines changed

‎protoc/private/protoc_integrity.bzl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PROTOC_DOWNLOAD_URL = (
1010
)
1111

1212
PROTOC_VERSIONS = [
13+
"30.0",
1314
"29.3",
1415
"29.2",
1516
"29.1",
@@ -25,6 +26,7 @@ PROTOC_BUILDS = {
2526
"@platforms//cpu:aarch64",
2627
],
2728
"integrity": {
29+
"30.0": "sha256-WrNHtx+4qHE5zsNqrEvQ7jrD9PKvn8aOvfVW4cCmZcY=",
2830
"29.3": "sha256-ZCc0kUDgHwbgSecHpYcJpPIhrnOrmgQlvEoAyNDhqzI=",
2931
"29.2": "sha256-Kc9IPi+yGCfl+sSWTjXq5HKiOOKMdi8C+xfc2T/4uJ8=",
3032
"29.1": "sha256-H3Sj8zVd58Bma8ElYRwTUywlmPhTUh0NPmIaWwnyR5k=",
@@ -39,6 +41,7 @@ PROTOC_BUILDS = {
3941
"@platforms//cpu:ppc64le",
4042
],
4143
"integrity": {
44+
"30.0": "sha256-yWGN4tFeIPFn0yaozAed/R8ETAVeDIv7eJ428guEktM=",
4245
"29.3": "sha256-DpiU7C45krFNGD586sFkZdam7nPh0jRpXYDm0elHAUw=",
4346
"29.2": "sha256-uiCJWht/NKb/ql5Rw0ExbErrxMFEN3hjQITpn262f/k=",
4447
"29.1": "sha256-B1vWZq1B60BKkjv6+pCkr6IHSiyaqLnHfERF5hbo75s=",
@@ -53,6 +56,7 @@ PROTOC_BUILDS = {
5356
"@platforms//cpu:s390x",
5457
],
5558
"integrity": {
59+
"30.0": "sha256-eYcU19uRFfTgQr6G3R7quXNG31Qxof4QFhXJwcHhZM8=",
5660
"29.3": "sha256-Y3hX/bqwsTNL2ysIcz8L5JaF5pMBG2EEgJSRrGL71NU=",
5761
"29.2": "sha256-LwpVmdprgpMqCNQz+nkTux1oWIl8zTxrwyhvAYt2xOA=",
5862
"29.1": "sha256-J5fNVlyn/7/ALaVsygE7/0+X5oMkizuZ3PfUuxf27GE=",
@@ -67,6 +71,7 @@ PROTOC_BUILDS = {
6771
"@platforms//cpu:x86_32",
6872
],
6973
"integrity": {
74+
"30.0": "sha256-OtMQ/NwrS/nzD1QrWbQDsrebqCss9DGb6E3poCZFrnY=",
7075
"29.3": "sha256-VGzx5pHOc/ZuKZzCLN1aF8YaEf5LbV34UHUHg4nx/Ck=",
7176
"29.2": "sha256-FU+NR+6YO8bxoa4tsUl+53E8Qt7vY1EXDxhmG/vNouw=",
7277
"29.1": "sha256-nd/EAbEqC4dHHg4POg0MKpByRj8EFDUUnpSfiiCCu+s=",
@@ -81,6 +86,7 @@ PROTOC_BUILDS = {
8186
"@platforms//cpu:x86_64",
8287
],
8388
"integrity": {
89+
"30.0": "sha256-L7vBgYRj1+bZPBmo3qg55mPKX4V5pS73jHaIGIM1+mw=",
8490
"29.3": "sha256-PoZmIMW+J2ZPPS+i1la18+CbUVK0Lxvtv0J7Mz6QAho=",
8591
"29.2": "sha256-Uunn7OVcfjDn6LvSVLSyG0CKUwm8qCZ2PHEktpahMuk=",
8692
"29.1": "sha256-AMg/6XIthelsgblBsp8Xp0SzO0zmbg8YAJ/Yk33iLGA=",
@@ -95,6 +101,7 @@ PROTOC_BUILDS = {
95101
"@platforms//cpu:aarch64",
96102
],
97103
"integrity": {
104+
"30.0": "sha256-frW1HTe6xBC6cO+RxAT5Cx+ry4I3Ev9lZYLTSsyHynQ=",
98105
"29.3": "sha256-K4o0A80Jf5XzumVuFLdscytrJtfxgzMLEeNu8rwCh2U=",
99106
"29.2": "sha256-DhU6ONbaGVlMmA5/fNPqDd1SydoQaMA8DYUzNp+/6yA=",
100107
"29.1": "sha256-uP1ZdpJhmKfE6lxutL94lZ1frtJ7/GGCVMqhBD93BEU=",
@@ -109,6 +116,7 @@ PROTOC_BUILDS = {
109116
"@platforms//cpu:x86_64",
110117
],
111118
"integrity": {
119+
"30.0": "sha256-lr86X77v1X19wMIKLHuz8iathLeeW1CThoJDIgF7lBc=",
112120
"29.3": "sha256-mniANtj5hU97A8MF30d3zw5U5bCB4lvxUlLah+DpCHU=",
113121
"29.2": "sha256-uivZg7XwbsONZjtgKISll96jmQpDgD1+FT7Y98VCaeE=",
114122
"29.1": "sha256-2wK0uG3k1MztPqmTQ0faKNyV5/OIY//EzjzCYoMCjaY=",
@@ -123,6 +131,7 @@ PROTOC_BUILDS = {
123131
"@platforms//cpu:x86_32",
124132
],
125133
"integrity": {
134+
"30.0": "sha256-g9c7ejnygRxhB/azkoWsWw8PRmNh1Gg96j796WNkMuY=",
126135
"29.3": "sha256-x8gCjBxNgBxTYCkg8shokgVAhr2WW2sjpLqV0hHcsdQ=",
127136
"29.2": "sha256-73CfcaUbOompsm3meCBc7zyV4h0IGLFn+/WwOackr9E=",
128137
"29.1": "sha256-EQXg+mRFnwsa9e5NWHfauGTy4Q2K6wRhjytpxsOm7QM=",
@@ -137,6 +146,7 @@ PROTOC_BUILDS = {
137146
"@platforms//cpu:x86_64",
138147
],
139148
"integrity": {
149+
"30.0": "sha256-yEww2siMaLQKLkfFtsdi3B7Amu6zLB0efs8l153PnNo=",
140150
"29.3": "sha256-V+pZ6fVRrY1x/6qbXPvgyh9Ocglyodt+wtEqtEv/k4M=",
141151
"29.2": "sha256-Weph77JLnYohQXHiyj/sVcPxUX7/BnZWyHXYoc0Gzk8=",
142152
"29.1": "sha256-fqSCJYV//BIkWIwzXCsa+deKGK+dV8BSjMoxk+M26c4=",

‎scala/deps.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ def rules_scala_dependencies():
5353
maybe(
5454
http_archive,
5555
name = "com_google_protobuf",
56-
sha256 = "008a11cc56f9b96679b4c285fd05f46d317d685be3ab524b2a310be0fbad987e",
57-
strip_prefix = "protobuf-29.3",
58-
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v29.3.tar.gz",
56+
sha256 = "9df0e9e8ebe39f4fbbb9cf7db3d811287fe3616b2f191eb2bf5eaa12539c881f",
57+
strip_prefix = "protobuf-30.0",
58+
url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v30.0.tar.gz",
5959
repo_mapping = {"@com_google_absl": "@abseil-cpp"},
6060
patches = [Label("//protoc:0001-protobuf-19679-rm-protoc-dep.patch")],
6161
patch_args = ["-p1"],

‎scripts/create_repository.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
SCALATEST_VERSION = "3.2.19"
3232
SCALAFMT_VERSION = "3.9.2"
3333
KIND_PROJECTOR_VERSION = "0.13.3"
34-
PROTOBUF_JAVA_VERSION = "4.29.3"
34+
PROTOBUF_JAVA_VERSION = "4.30.0"
3535
JLINE_VERSION = '3.29.0'
3636
SCALAPB_VERSION = '1.0.0-alpha.1'
3737
PROTOC_BRIDGE_VERSION = '0.9.8'
38-
GRPC_VERSION = '1.70.0'
38+
GRPC_VERSION = '1.71.0'
3939
GRPC_COMMON_PROTOS_VERSION = '2.53.0'
4040
GRPC_LIBS = ['netty', 'protobuf', 'stub']
4141
GUAVA_VERSION = '33.4.0-jre'

‎scripts/update_protoc_integrity.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import sys
2828

2929
PROTOC_VERSIONS = [
30+
"30.0",
3031
"29.3",
3132
"29.2",
3233
"29.1",

‎third_party/repositories/scala_2_11.bzl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ artifacts = {
6767
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
6868
},
6969
"com_google_protobuf_protobuf_java": {
70-
"artifact": "com.google.protobuf:protobuf-java:4.29.3",
71-
"sha256": "442db5991a11974d72127353be7d7e7abdf8d943d83b16668cb2e336d7392f54",
70+
"artifact": "com.google.protobuf:protobuf-java:4.30.0",
71+
"sha256": "3e9ec992a1bd02eeec7229879e5e99798c0f582a3cbfc924792640256e87b67d",
7272
},
7373
"com_lihaoyi_fansi": {
7474
"artifact": "com.lihaoyi:fansi_2.11:0.2.6",
@@ -566,24 +566,24 @@ artifacts = {
566566
"sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0",
567567
},
568568
"scala_proto_rules_grpc_api": {
569-
"artifact": "io.grpc:grpc-api:1.70.0",
570-
"sha256": "45faf2ac1bf2791e8fdabce53684a86b62c99b84cba26fb13a5ba3f4abf80d6c",
569+
"artifact": "io.grpc:grpc-api:1.71.0",
570+
"sha256": "49771bad244de122f05780c12f3e74ba9a301be125d0941a85e649212f4a8a01",
571571
"deps": [
572572
"@com_google_code_findbugs_jsr305",
573573
"@com_google_errorprone_error_prone_annotations",
574574
"@io_bazel_rules_scala_guava",
575575
],
576576
},
577577
"scala_proto_rules_grpc_context": {
578-
"artifact": "io.grpc:grpc-context:1.70.0",
579-
"sha256": "eb2824831c0ac03e741efda86b141aa863a481ebc4aaf5a5c1f13a481dbb40ff",
578+
"artifact": "io.grpc:grpc-context:1.71.0",
579+
"sha256": "dd0484ac5d0baf7ee810331504dc6202c7b426bc88dce24100e77f576904dd52",
580580
"deps": [
581581
"@scala_proto_rules_grpc_api",
582582
],
583583
},
584584
"scala_proto_rules_grpc_core": {
585-
"artifact": "io.grpc:grpc-core:1.70.0",
586-
"sha256": "c2b5576b8b363b1b1006673c492d912500baaa1581430a7f9c05e82cc5bdfba4",
585+
"artifact": "io.grpc:grpc-core:1.71.0",
586+
"sha256": "03099494c60cb9fea5802ebba8d767e44697062ec05e5207b5ae897e09bd38e9",
587587
"deps": [
588588
"@com_google_android_annotations",
589589
"@com_google_code_gson_gson",
@@ -596,8 +596,8 @@ artifacts = {
596596
],
597597
},
598598
"scala_proto_rules_grpc_netty": {
599-
"artifact": "io.grpc:grpc-netty:1.70.0",
600-
"sha256": "466bc29f36bb3b33ba6fa044d17cdfac494e5715ff606e1794541d0b90b42c16",
599+
"artifact": "io.grpc:grpc-netty:1.71.0",
600+
"sha256": "dc45a8d584b9994645470f7e3543238a8618c67ea3cfa03089d2a67ea1a4ddf1",
601601
"deps": [
602602
"@com_google_errorprone_error_prone_annotations",
603603
"@io_bazel_rules_scala_guava",
@@ -612,8 +612,8 @@ artifacts = {
612612
],
613613
},
614614
"scala_proto_rules_grpc_protobuf": {
615-
"artifact": "io.grpc:grpc-protobuf:1.70.0",
616-
"sha256": "9b98039ed826604c46d6ac8f8a182d413d348ec6abe26467736b05aa92e7e1d3",
615+
"artifact": "io.grpc:grpc-protobuf:1.71.0",
616+
"sha256": "7eba0625fba8e176c0fc1b80610fc2c52c036d95805ffdd3f6985a51c968de94",
617617
"deps": [
618618
"@com_google_code_findbugs_jsr305",
619619
"@com_google_protobuf_protobuf_java",
@@ -624,17 +624,17 @@ artifacts = {
624624
],
625625
},
626626
"scala_proto_rules_grpc_protobuf_lite": {
627-
"artifact": "io.grpc:grpc-protobuf-lite:1.70.0",
628-
"sha256": "e7cc2ca8981672851cbebf83a24bfb93c1b2b058e75c1a817a757b914f33403d",
627+
"artifact": "io.grpc:grpc-protobuf-lite:1.71.0",
628+
"sha256": "ffad977400b49649fa2d5404abaadfca66c7e5956974f192411e8946a12e5f53",
629629
"deps": [
630630
"@com_google_code_findbugs_jsr305",
631631
"@io_bazel_rules_scala_guava",
632632
"@scala_proto_rules_grpc_api",
633633
],
634634
},
635635
"scala_proto_rules_grpc_stub": {
636-
"artifact": "io.grpc:grpc-stub:1.70.0",
637-
"sha256": "5adaa1ec1f744b67ae14a8dbc39c9589c010fad0fd557b0a02966202e4d23a18",
636+
"artifact": "io.grpc:grpc-stub:1.71.0",
637+
"sha256": "51912e612b28db65eec0332a8be494b3c54d347ecd2c5f6a7fdd2cb994fab360",
638638
"deps": [
639639
"@com_google_errorprone_error_prone_annotations",
640640
"@io_bazel_rules_scala_guava",
@@ -643,8 +643,8 @@ artifacts = {
643643
],
644644
},
645645
"scala_proto_rules_grpc_util": {
646-
"artifact": "io.grpc:grpc-util:1.70.0",
647-
"sha256": "683aff93d2cabc44ff21dc9ab7794f8ae7b4c65d18748c8474535311eabe8dc4",
646+
"artifact": "io.grpc:grpc-util:1.71.0",
647+
"sha256": "32a9197c541bb072dc2f728e235347c3c0f7cf8062abf3de58c50b4fc70f31b1",
648648
"deps": [
649649
"@io_bazel_rules_scala_guava",
650650
"@org_codehaus_mojo_animal_sniffer_annotations",

‎third_party/repositories/scala_2_12.bzl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ artifacts = {
5252
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
5353
},
5454
"com_google_protobuf_protobuf_java": {
55-
"artifact": "com.google.protobuf:protobuf-java:4.29.3",
56-
"sha256": "442db5991a11974d72127353be7d7e7abdf8d943d83b16668cb2e336d7392f54",
55+
"artifact": "com.google.protobuf:protobuf-java:4.30.0",
56+
"sha256": "3e9ec992a1bd02eeec7229879e5e99798c0f582a3cbfc924792640256e87b67d",
5757
},
5858
"com_lihaoyi_fansi": {
5959
"artifact": "com.lihaoyi:fansi_2.12:0.5.0",
@@ -596,24 +596,24 @@ artifacts = {
596596
"sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0",
597597
},
598598
"scala_proto_rules_grpc_api": {
599-
"artifact": "io.grpc:grpc-api:1.70.0",
600-
"sha256": "45faf2ac1bf2791e8fdabce53684a86b62c99b84cba26fb13a5ba3f4abf80d6c",
599+
"artifact": "io.grpc:grpc-api:1.71.0",
600+
"sha256": "49771bad244de122f05780c12f3e74ba9a301be125d0941a85e649212f4a8a01",
601601
"deps": [
602602
"@com_google_code_findbugs_jsr305",
603603
"@com_google_errorprone_error_prone_annotations",
604604
"@io_bazel_rules_scala_guava",
605605
],
606606
},
607607
"scala_proto_rules_grpc_context": {
608-
"artifact": "io.grpc:grpc-context:1.70.0",
609-
"sha256": "eb2824831c0ac03e741efda86b141aa863a481ebc4aaf5a5c1f13a481dbb40ff",
608+
"artifact": "io.grpc:grpc-context:1.71.0",
609+
"sha256": "dd0484ac5d0baf7ee810331504dc6202c7b426bc88dce24100e77f576904dd52",
610610
"deps": [
611611
"@scala_proto_rules_grpc_api",
612612
],
613613
},
614614
"scala_proto_rules_grpc_core": {
615-
"artifact": "io.grpc:grpc-core:1.70.0",
616-
"sha256": "c2b5576b8b363b1b1006673c492d912500baaa1581430a7f9c05e82cc5bdfba4",
615+
"artifact": "io.grpc:grpc-core:1.71.0",
616+
"sha256": "03099494c60cb9fea5802ebba8d767e44697062ec05e5207b5ae897e09bd38e9",
617617
"deps": [
618618
"@com_google_android_annotations",
619619
"@com_google_code_gson_gson",
@@ -626,8 +626,8 @@ artifacts = {
626626
],
627627
},
628628
"scala_proto_rules_grpc_netty": {
629-
"artifact": "io.grpc:grpc-netty:1.70.0",
630-
"sha256": "466bc29f36bb3b33ba6fa044d17cdfac494e5715ff606e1794541d0b90b42c16",
629+
"artifact": "io.grpc:grpc-netty:1.71.0",
630+
"sha256": "dc45a8d584b9994645470f7e3543238a8618c67ea3cfa03089d2a67ea1a4ddf1",
631631
"deps": [
632632
"@com_google_errorprone_error_prone_annotations",
633633
"@io_bazel_rules_scala_guava",
@@ -642,8 +642,8 @@ artifacts = {
642642
],
643643
},
644644
"scala_proto_rules_grpc_protobuf": {
645-
"artifact": "io.grpc:grpc-protobuf:1.70.0",
646-
"sha256": "9b98039ed826604c46d6ac8f8a182d413d348ec6abe26467736b05aa92e7e1d3",
645+
"artifact": "io.grpc:grpc-protobuf:1.71.0",
646+
"sha256": "7eba0625fba8e176c0fc1b80610fc2c52c036d95805ffdd3f6985a51c968de94",
647647
"deps": [
648648
"@com_google_code_findbugs_jsr305",
649649
"@com_google_protobuf_protobuf_java",
@@ -654,17 +654,17 @@ artifacts = {
654654
],
655655
},
656656
"scala_proto_rules_grpc_protobuf_lite": {
657-
"artifact": "io.grpc:grpc-protobuf-lite:1.70.0",
658-
"sha256": "e7cc2ca8981672851cbebf83a24bfb93c1b2b058e75c1a817a757b914f33403d",
657+
"artifact": "io.grpc:grpc-protobuf-lite:1.71.0",
658+
"sha256": "ffad977400b49649fa2d5404abaadfca66c7e5956974f192411e8946a12e5f53",
659659
"deps": [
660660
"@com_google_code_findbugs_jsr305",
661661
"@io_bazel_rules_scala_guava",
662662
"@scala_proto_rules_grpc_api",
663663
],
664664
},
665665
"scala_proto_rules_grpc_stub": {
666-
"artifact": "io.grpc:grpc-stub:1.70.0",
667-
"sha256": "5adaa1ec1f744b67ae14a8dbc39c9589c010fad0fd557b0a02966202e4d23a18",
666+
"artifact": "io.grpc:grpc-stub:1.71.0",
667+
"sha256": "51912e612b28db65eec0332a8be494b3c54d347ecd2c5f6a7fdd2cb994fab360",
668668
"deps": [
669669
"@com_google_errorprone_error_prone_annotations",
670670
"@io_bazel_rules_scala_guava",
@@ -673,8 +673,8 @@ artifacts = {
673673
],
674674
},
675675
"scala_proto_rules_grpc_util": {
676-
"artifact": "io.grpc:grpc-util:1.70.0",
677-
"sha256": "683aff93d2cabc44ff21dc9ab7794f8ae7b4c65d18748c8474535311eabe8dc4",
676+
"artifact": "io.grpc:grpc-util:1.71.0",
677+
"sha256": "32a9197c541bb072dc2f728e235347c3c0f7cf8062abf3de58c50b4fc70f31b1",
678678
"deps": [
679679
"@io_bazel_rules_scala_guava",
680680
"@org_codehaus_mojo_animal_sniffer_annotations",

0 commit comments

Comments
 (0)