Skip to content

Commit a4861eb

Browse files
mblandmbland
committed
Update protoc-bridge and grpc dependencies
1 parent 67d1c50 commit a4861eb

File tree

3 files changed

+270
-70
lines changed

3 files changed

+270
-70
lines changed

‎scala_proto/default/repositories.bzl

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,46 @@ def scala_proto_default_repositories(
66
overriden_artifacts = {}):
77
repositories(
88
for_artifact_ids = [
9-
"scala_proto_rules_scalapb_plugin",
10-
"scala_proto_rules_protoc_bridge",
11-
"scala_proto_rules_scalapb_runtime",
12-
"scala_proto_rules_scalapb_runtime_grpc",
13-
"scala_proto_rules_scalapb_lenses",
14-
"scala_proto_rules_scalapb_fastparse",
15-
"scala_proto_rules_grpc_core",
9+
"com_google_code_findbugs_jsr305",
10+
"com_google_errorprone_error_prone_annotations",
11+
"com_google_protobuf_protobuf_java",
12+
"scala_proto_rules_dev_dirs_directories",
13+
"scala_proto_rules_disruptor",
14+
"scala_proto_rules_google_instrumentation",
1615
"scala_proto_rules_grpc_api",
17-
"scala_proto_rules_grpc_stub",
18-
"scala_proto_rules_grpc_protobuf",
19-
"scala_proto_rules_grpc_netty",
2016
"scala_proto_rules_grpc_context",
21-
"scala_proto_rules_perfmark_api",
17+
"scala_proto_rules_grpc_core",
18+
"scala_proto_rules_grpc_netty",
19+
"scala_proto_rules_grpc_proto_google_common_protos",
20+
"scala_proto_rules_grpc_protobuf",
21+
"scala_proto_rules_grpc_stub",
2222
"scala_proto_rules_guava",
23-
"scala_proto_rules_google_instrumentation",
23+
"scala_proto_rules_guava_checker_qual",
24+
"scala_proto_rules_guava_failureaccess",
25+
"scala_proto_rules_guava_j2objc_annotations",
26+
"scala_proto_rules_guava_listenablefuture",
27+
"scala_proto_rules_netty_buffer",
2428
"scala_proto_rules_netty_codec",
2529
"scala_proto_rules_netty_codec_http",
26-
"scala_proto_rules_netty_codec_socks",
2730
"scala_proto_rules_netty_codec_http2",
28-
"scala_proto_rules_netty_handler",
29-
"scala_proto_rules_netty_buffer",
30-
"scala_proto_rules_netty_transport",
31-
"scala_proto_rules_netty_resolver",
31+
"scala_proto_rules_netty_codec_socks",
3232
"scala_proto_rules_netty_common",
33+
"scala_proto_rules_netty_handler",
3334
"scala_proto_rules_netty_handler_proxy",
35+
"scala_proto_rules_netty_resolver",
36+
"scala_proto_rules_netty_transport",
3437
"scala_proto_rules_opencensus_api",
38+
"scala_proto_rules_opencensus_contrib_grpc_metrics",
3539
"scala_proto_rules_opencensus_impl",
36-
"scala_proto_rules_disruptor",
3740
"scala_proto_rules_opencensus_impl_core",
38-
"scala_proto_rules_opencensus_contrib_grpc_metrics",
41+
"scala_proto_rules_perfmark_api",
42+
"scala_proto_rules_protoc_bridge",
43+
"scala_proto_rules_protoc_gen",
44+
"scala_proto_rules_scalapb_fastparse",
45+
"scala_proto_rules_scalapb_lenses",
46+
"scala_proto_rules_scalapb_plugin",
47+
"scala_proto_rules_scalapb_runtime",
48+
"scala_proto_rules_scalapb_runtime_grpc",
3949
],
4050
maven_servers = maven_servers,
4151
fetch_sources = True,

‎third_party/repositories/scala_2_12.bzl

Lines changed: 122 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ artifacts = {
6262
"sha256": "a5f01a0ecb7479b4f43e03147094279609d66fdaa04a9cb3238510d7c4dbc22a",
6363
},
6464
"io_bazel_rules_scala_scala_xml": {
65-
"artifact": "org.scala-lang.modules:scala-xml_2.12:1.2.0",
66-
"sha256": "1b48dc206f527b7604ef32492ada8e71706c63a65d999e0cabdafdc5793b4d63",
65+
"artifact": "org.scala-lang.modules:scala-xml_2.12:1.3.0",
66+
"sha256": "ccaa5edaf1e653f5ba6bfbb3cefa525f34719112b61e4fa42e8c4fcf690a3e35",
6767
},
6868
"io_bazel_rules_scala_scala_parser_combinators": {
6969
"artifact": "org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2",
@@ -191,8 +191,8 @@ artifacts = {
191191
],
192192
},
193193
"com_lihaoyi_fastparse": {
194-
"artifact": "com.lihaoyi:fastparse_2.12:2.1.2",
195-
"sha256": "92a98f89c4f9559715124599ee5ce8f0d36ee326f5c7ef88b51487de39a3602e",
194+
"artifact": "com.lihaoyi:fastparse_2.12:2.1.3",
195+
"sha256": "e8b831a843c0eb5105d42e4b6febfc772b3aed3a853a899e6c8196e9ecc057df",
196196
"deps": [
197197
"@com_lihaoyi_sourcecode",
198198
],
@@ -232,6 +232,14 @@ artifacts = {
232232
"@io_bazel_rules_scala_scala_library",
233233
],
234234
},
235+
"com_google_code_findbugs_jsr305": {
236+
"artifact": "com.google.code.findbugs:jsr305:3.0.2",
237+
"sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
238+
},
239+
"com_google_errorprone_error_prone_annotations": {
240+
"artifact": "com.google.errorprone:error_prone_annotations:2.33.0",
241+
"sha256": "d9f3af3974fa64cd0f0f34238f40d9898abf7df19ca15849e1978f5beb818cb6",
242+
},
235243
"io_bazel_rules_scala_org_openjdk_jmh_jmh_core": {
236244
"artifact": "org.openjdk.jmh:jmh-core:1.36",
237245
"sha256": "f90974e37d0da8886b5c05e6e3e7e20556900d747c5a41c1023b47c3301ea73c",
@@ -297,61 +305,148 @@ artifacts = {
297305
"@io_bazel_rules_scala_org_specs2_specs2_core",
298306
],
299307
},
308+
"scala_proto_rules_dev_dirs_directories": {
309+
"artifact": "dev.dirs:directories:26",
310+
"sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4",
311+
},
300312
"scala_proto_rules_scalapb_plugin": {
301-
"artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.9.7",
302-
"sha256": "516ed567e2c3ac28b91a2f350d3febc7a6a396978718145f536853ffe8de40c2",
313+
"artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.11.17",
314+
"sha256": "a9dc6cc0dbe6ff53a7c914433d5a19711018217b432b385c97778cd4050210d0",
315+
"deps": [
316+
"@com_google_protobuf_protobuf_java",
317+
"@org_scala_lang_modules_scala_collection_compat",
318+
"@scala_proto_rules_protoc_gen",
319+
],
303320
},
304321
"scala_proto_rules_protoc_bridge": {
305-
"artifact": "com.thesamet.scalapb:protoc-bridge_2.12:0.7.14",
306-
"sha256": "2b8db0b71be5052768a96ccc41c9bb03f3f19e1e267e810a64963566538b1a2b",
322+
"artifact": "com.thesamet.scalapb:protoc-bridge_2.12:0.9.7",
323+
"sha256": "6d039a28d29253ac78aec0e3102f6423d269e65203c114a17f0d52a91d4876f4",
324+
"deps": [
325+
"@scala_proto_rules_dev_dirs_directories",
326+
],
327+
},
328+
"scala_proto_rules_protoc_gen": {
329+
"artifact": "com.thesamet.scalapb:protoc-gen_2.12:0.9.7",
330+
"sha256": "81df11e24e52887515dff20eb4d1a050fd58e078200291c3c87fd04218abe53b",
331+
"deps": [
332+
"@scala_proto_rules_protoc_bridge",
333+
],
307334
},
308335
"scala_proto_rules_scalapb_runtime": {
309-
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.9.7",
310-
"sha256": "82624a7fadaa323bbb8d33e37f055ce42e761c203573ace3ccf95bd0511917fe",
336+
"artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.17",
337+
"sha256": "6624beb8e47c11de33262f867dd86d25e66ddce5507c9c13bfd7cc2f2e7652fe",
338+
"deps": [
339+
"@com_google_protobuf_protobuf_java",
340+
"@org_scala_lang_modules_scala_collection_compat",
341+
"@scala_proto_rules_scalapb_lenses",
342+
],
311343
},
312344
"scala_proto_rules_scalapb_runtime_grpc": {
313345
"artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.9.7",
314-
"sha256": "4c00f2a57cc1d00a2d454f695c3f1e565173e1d1297294f1cf81339bdeba3f4a",
346+
"sha256": "7919fbb62f3ae9de9eec3a102b24dc1ef570ff098d1e41e464cf2ac7398cff5f",
347+
"deps": [
348+
"@scala_proto_rules_scalapb_runtime",
349+
"@scala_proto_grpc_stub",
350+
"@scala_proto_grpc_protobuf",
351+
"@org_scala_lang_modules_scala_collection_compat",
352+
],
315353
},
316354
"scala_proto_rules_scalapb_lenses": {
317-
"artifact": "com.thesamet.scalapb:lenses_2.12:0.9.7",
318-
"sha256": "fff4fc9d47ad44c1371ff2d8dfa2b5907826c4b98ca576baf67f14d31d0d9be1",
355+
"artifact": "com.thesamet.scalapb:lenses_2.12:0.11.17",
356+
"sha256": "c984f7695e9a5034afbf725b7eab919fc00bb24dc30c8f6f923d6d32096a1fa0",
357+
"deps": [
358+
"@org_scala_lang_modules_scala_collection_compat",
359+
],
319360
},
320361
"scala_proto_rules_scalapb_fastparse": {
321362
"artifact": "com.lihaoyi:fastparse_2.12:2.1.3",
322363
"sha256": "e8b831a843c0eb5105d42e4b6febfc772b3aed3a853a899e6c8196e9ecc057df",
323364
},
324365
"scala_proto_rules_grpc_core": {
325-
"artifact": "io.grpc:grpc-core:1.24.0",
326-
"sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e",
366+
"artifact": "io.grpc:grpc-core:1.68.0",
367+
"sha256": "a8dd684c322ba8a86a95b2653fa4106c918a56edd863e45aaf63839d6a6ea082",
368+
"deps": [
369+
"@scala_proto_rules_grpc_api",
370+
]
327371
},
328372
"scala_proto_rules_grpc_api": {
329-
"artifact": "io.grpc:grpc-api:1.24.0",
330-
"sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598",
373+
"artifact": "io.grpc:grpc-api:1.68.0",
374+
"sha256": "b5120a11da5ce5ddfab019bbb69f5868529c9b5def1ba5b283251cc95fb3ba91",
375+
"deps": [
376+
"@com_google_code_findbugs_jsr305",
377+
"@com_google_errorprone_error_prone_annotations",
378+
]
331379
},
332380
"scala_proto_rules_grpc_stub": {
333-
"artifact": "io.grpc:grpc-stub:1.24.0",
334-
"sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815",
381+
"artifact": "io.grpc:grpc-stub:1.68.0",
382+
"sha256": "7c4090509cd6ea0432305f9397da21127b691905bdcf163a306bedb1c6f4ead7",
383+
"deps": [
384+
"@scala_proto_rules_grpc_api",
385+
"@scala_proto_rules_guava",
386+
],
387+
},
388+
"scala_proto_rules_grpc_proto_google_common_protos": {
389+
"artifact": "com.google.api.grpc:proto-google-common-protos:2.46.0",
390+
"sha256": "e0d487081fd6bed6ed0ff962700555ab5e7caa4a64dce4551972c178fc6060ff",
391+
"deps": [
392+
"@com_google_protobuf_protobuf_java",
393+
],
335394
},
336395
"scala_proto_rules_grpc_protobuf": {
337-
"artifact": "io.grpc:grpc-protobuf:1.24.0",
338-
"sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc",
396+
"artifact": "io.grpc:grpc-protobuf:1.68.0",
397+
"sha256": "79704cf169ee27151fce4375a4d91fe828d276d921eef5a7f497d020b0a5d345",
398+
"deps": [
399+
"@com_google_code_findbugs_jsr305",
400+
"@com_google_protobuf_protobuf_java",
401+
"@scala_proto_rules_grpc_api",
402+
"@scala_proto_rules_grpc_proto_google_common_protos",
403+
],
339404
},
340405
"scala_proto_rules_grpc_netty": {
341-
"artifact": "io.grpc:grpc-netty:1.24.0",
342-
"sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042",
406+
"artifact": "io.grpc:grpc-netty:1.68.0",
407+
"sha256": "28911aa0546079689af704bc279dc8c490f9e259712a2f9256340674ba1cbc1e",
408+
"deps": [
409+
"@scala_proto_rules_grpc_api",
410+
],
343411
},
344412
"scala_proto_rules_grpc_context": {
345-
"artifact": "io.grpc:grpc-context:1.24.0",
346-
"sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea",
413+
"artifact": "io.grpc:grpc-context:1.68.0",
414+
"sha256": "45f85a394466f963f1f7a5c5555e6dda35efd05ce1c687203a217d7048f6f089",
415+
"deps": [
416+
"@scala_proto_rules_grpc_api",
417+
],
347418
},
348419
"scala_proto_rules_perfmark_api": {
349420
"artifact": "io.perfmark:perfmark-api:0.17.0",
350421
"sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9",
351422
},
352423
"scala_proto_rules_guava": {
353-
"artifact": "com.google.guava:guava:26.0-android",
354-
"sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5",
424+
"artifact": "com.google.guava:guava:33.3.1-jre",
425+
"sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90",
426+
"deps": [
427+
"@com_google_code_findbugs_jsr305",
428+
"@com_google_errorprone_error_prone_annotations",
429+
"@scala_proto_rules_failureaccess",
430+
"@scala_proto_rules_guava_checker_qual",
431+
"@scala_proto_rules_guava_j2objc_annotations",
432+
"@scala_proto_rules_listenablefuture",
433+
],
434+
},
435+
"scala_proto_rules_guava_checker_qual": {
436+
"artifact": "org.checkerframework:checker-qual:3.43.0",
437+
"sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6",
438+
},
439+
"scala_proto_rules_guava_failureaccess": {
440+
"artifact": "com.google.guava:failureaccess:1.0.2",
441+
"sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064",
442+
},
443+
"scala_proto_rules_guava_j2objc_annotations": {
444+
"artifact": "com.google.j2objc:j2objc-annotations:3.0.0",
445+
"sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
446+
},
447+
"scala_proto_rules_guava_listenablefuture": {
448+
"artifact": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
449+
"sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
355450
},
356451
"scala_proto_rules_google_instrumentation": {
357452
"artifact": "com.google.instrumentation:instrumentation-api:0.3.0",

0 commit comments

Comments
 (0)