From 521adceea9ab312795c7a5393b837bada3ef2f4e Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Wed, 6 Nov 2024 20:40:39 -0500 Subject: [PATCH 1/9] Bump ScalaPB and gRPC, exclude listenablefuture Adds these versions to `scripts/create_repository.py`. There are breakages still that future commits will address, but the following are fixed in this one. Removes the unnecessary `true` parameter from `.getPlaintext(true)` in `test/TestServer.scala` to fix this error after the gRPC bump: ```txt ERROR: .../test/BUILD:676:14: scala @//test:lib_with_scala_proto_dep failed: (Exit 1): scalac failed: error executing command (from target //test:lib_with_scala_proto_dep) bazel-bin/src/java/io/bazel/rulesscala/scalac/scalac @bazel-out/darwin_arm64-fastbuild/bin/test/lib_with_scala_proto_dep.jar-0.params test/TestServer.scala:70: error: no arguments allowed for nullary method usePlaintext: ()?0 val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build ^ ``` We exclude `com.google.guava:listenablefuture` because trying to download it breaks the build with an HTTP 404 (everything builds fine without it anyway): ```txt INFO: repository @io_bazel_rules_scala_listenablefuture' used the following cache hits instead of downloading the corresponding file. * Hash '...' for https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar WARNING: Download from https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar failed: class java.io.FileNotFoundException GET returned 404 Not Found WARNING: Download from https://maven-central.storage-download.googleapis.com/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar failed: class java.io.FileNotFoundException GET returned 404 Not Found WARNING: Download from https://mirror.bazel.build/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar failed: class java.io.FileNotFoundException GET returned 404 Not Found WARNING: Download from https://jcenter.bintray.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar failed: class java.io.FileNotFoundException GET returned 404 Not Found ERROR: An error occurred during the fetch of repository 'io_bazel_rules_scala_listenablefuture': Traceback (most recent call last): File ".../scala/scala_maven_import_external.bzl", line 130, column 32, in _jvm_import_external repository_ctx.download(srcurls, srcpath, srcsha, auth = _get_auth(repository_ctx, srcurls)) Error in download: java.io.IOException: Error downloading [ ...4 URLs from WARNINGs above... ] to .../external/io_bazel_rules_scala_listenablefuture/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-src.jar: GET returned 404 Not Found ERROR: /Users/mbland/src/bazelbuild/rules_scala/WORKSPACE:75:25: fetching jvm_import_external rule //external:io_bazel_rules_scala_listenablefuture: [ ...Traceback, java.io.IOException, and HTTP 404 from above... ] ERROR: .../external/io_bazel_rules_scala_guava/BUILD:9:13: @io_bazel_rules_scala_guava//:io_bazel_rules_scala_guava depends on @io_bazel_rules_scala_listenablefuture//:io_bazel_rules_scala_listenablefuture in repository @io_bazel_rules_scala_listenablefuture which failed to fetch. no such package '@io_bazel_rules_scala_listenablefuture//': [ ...java.io.IOException and HTTP 404 from above... ] ERROR: Analysis of target '//test/proto/custom_generator:failing_scala_proto_deps_toolchain_def' failed; build aborted: ``` --- scala_proto/default/repositories.bzl | 15 +- scripts/create_repository.py | 24 +- test/TestServer.scala | 2 +- third_party/repositories/scala_2_11.bzl | 275 +++++++++++++++++++---- third_party/repositories/scala_2_12.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_2_13.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_3_1.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_3_2.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_3_3.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_3_4.bzl | 282 ++++++++++++++++++++---- third_party/repositories/scala_3_5.bzl | 282 ++++++++++++++++++++---- 11 files changed, 1916 insertions(+), 374 deletions(-) diff --git a/scala_proto/default/repositories.bzl b/scala_proto/default/repositories.bzl index 1b13fb77c..cd32c69e5 100644 --- a/scala_proto/default/repositories.bzl +++ b/scala_proto/default/repositories.bzl @@ -6,18 +6,29 @@ def scala_proto_default_repositories( overriden_artifacts = {}): repositories( for_artifact_ids = [ + "com_google_android_annotations", + "com_google_code_findbugs_jsr305", + "com_google_code_gson_gson", + "com_google_errorprone_error_prone_annotations", + "com_google_j2objc_j2objc_annotations", "com_google_protobuf_protobuf_java", "com_lihaoyi_fastparse", "com_lihaoyi_sourcecode", + "dev_dirs_directories", + "io_bazel_rules_scala_failureaccess", "io_bazel_rules_scala_guava", + "org_codehaus_mojo_animal_sniffer_annotations", + "org_checkerframework_checker_qual", "scala_proto_rules_disruptor", - "scala_proto_rules_instrumentation_api", "scala_proto_rules_grpc_api", "scala_proto_rules_grpc_context", "scala_proto_rules_grpc_core", "scala_proto_rules_grpc_netty", "scala_proto_rules_grpc_protobuf", + "scala_proto_rules_grpc_protobuf_lite", "scala_proto_rules_grpc_stub", + "scala_proto_rules_grpc_util", + "scala_proto_rules_instrumentation_api", "scala_proto_rules_netty_buffer", "scala_proto_rules_netty_codec", "scala_proto_rules_netty_codec_http", @@ -28,11 +39,13 @@ def scala_proto_default_repositories( "scala_proto_rules_netty_handler_proxy", "scala_proto_rules_netty_resolver", "scala_proto_rules_netty_transport", + "scala_proto_rules_netty_transport_native_unix_common", "scala_proto_rules_opencensus_api", "scala_proto_rules_opencensus_contrib_grpc_metrics", "scala_proto_rules_opencensus_impl", "scala_proto_rules_opencensus_impl_core", "scala_proto_rules_perfmark_api", + "scala_proto_rules_proto_google_common_protos", "scala_proto_rules_scalapb_compilerplugin", "scala_proto_rules_scalapb_lenses", "scala_proto_rules_scalapb_protoc_bridge", diff --git a/scripts/create_repository.py b/scripts/create_repository.py index f7e5f54ee..2741b67ad 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -32,9 +32,14 @@ KIND_PROJECTOR_VERSION = "0.13.3" PROTOBUF_JAVA_VERSION = "4.28.3" JLINE_VERSION = '3.27.1' -SCALAPB_VERSION = '0.9.8' +SCALAPB_VERSION = '0.11.17' +PROTOC_BRIDGE_VERSION = '0.9.7' +GRPC_VERSION = '1.68.1' +GRPC_COMMON_PROTOS_VERSION = '2.48.0' +GRPC_LIBS = ['netty', 'protobuf', 'stub'] +GUAVA_VERSION = '33.3.1-jre' -EXCLUDED_ARTIFACTS = set() +EXCLUDED_ARTIFACTS = set(["com.google.guava:listenablefuture"]) THIS_FILE = Path(__file__) REPO_ROOT = THIS_FILE.parent.parent @@ -79,26 +84,35 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]: scalafmt_version = SCALAFMT_VERSION scalapb_version = SCALAPB_VERSION + protoc_bridge_version = PROTOC_BRIDGE_VERSION if scala_major == '2.11': scalafmt_version = '2.7.5' scalapb_version = '0.9.8' + protoc_bridge_version = '0.7.14' root_artifacts = [ + 'com.google.api.grpc:proto-google-common-protos:' + + GRPC_COMMON_PROTOS_VERSION, + f'com.google.guava:guava:{GUAVA_VERSION}', f'com.google.protobuf:protobuf-java:{PROTOBUF_JAVA_VERSION}', + f'com.thesamet.scalapb:protoc-bridge_{scala_2_major}:' + + protoc_bridge_version, f'com.thesamet.scalapb:scalapb-runtime_{scala_2_major}:' + scalapb_version, + f'com.thesamet.scalapb:scalapb-runtime-grpc_{scala_2_major}:' + + scalapb_version, f'org.scala-lang.modules:scala-parser-combinators_{scala_2_major}:' + PARSER_COMBINATORS_VERSION, - f'org.scalameta:scalafmt-core_{scala_2_major}:{scalafmt_version}', - f'org.scalatest:scalatest_{scalatest_major}:{SCALATEST_VERSION}', f'org.scala-lang:scala-compiler:{scala_2_version}', f'org.scala-lang:scala-library:{scala_2_version}', f'org.scala-lang:scala-reflect:{scala_2_version}', f'org.scala-lang:scalap:{scala_2_version}', + f'org.scalameta:scalafmt-core_{scala_2_major}:{scalafmt_version}', + f'org.scalatest:scalatest_{scalatest_major}:{SCALATEST_VERSION}', f'org.typelevel:kind-projector_{scala_2_version}:' + KIND_PROJECTOR_VERSION, - ] + ] + [f'io.grpc:grpc-{lib}:{GRPC_VERSION}' for lib in GRPC_LIBS] if scala_version == max_scala_2_version or is_scala_3: # Since the Scala 2.13 compiler is included in Scala 3 deps. diff --git a/test/TestServer.scala b/test/TestServer.scala index 3a44df27f..850227f75 100644 --- a/test/TestServer.scala +++ b/test/TestServer.scala @@ -67,7 +67,7 @@ class TestServer(executionContext: ExecutionContext) { self => object TestClient { def apply(host: String, port: Int): TestClient = { - val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build + val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build val blockingStub = TestServiceGrpc.blockingStub(channel) new TestClient(channel, blockingStub) } diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl index 36de65292..a5bcfa29d 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -30,6 +30,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -43,6 +62,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -87,9 +110,20 @@ artifacts = { "artifact": "com.typesafe:config:1.2.1", "sha256": "c160fbd78f51a0c2375a794e435ce2112524a6871f64d0331895e9e26ee8b9ee", }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -382,6 +416,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_scala_lang_modules_scala_collection_compat": { "artifact": "org.scala-lang.modules:scala-collection-compat_2.11:2.1.2", "sha256": "e9667b8b7276aeb42599f536fe4d7caab06eabc55e9995572267ad60c7a11c8b", @@ -396,6 +438,18 @@ artifacts = { "@io_bazel_rules_scala_scala_compiler", ], }, + "org_scala_sbt_test_interface": { + "artifact": "org.scala-sbt:test-interface:1.0", + "sha256": "15f70b38bb95f3002fec9aea54030f19bb4ecfbad64c67424b5e5fea09cd749e", + }, + "org_scalacheck_scalacheck": { + "artifact": "org.scalacheck:scalacheck_2.11:1.14.3", + "sha256": "3cbc95bb615f1a384b8c4406dfc42b225499f08adf7639de11566069e47d44cf", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@org_scala_sbt_test_interface", + ], + }, "org_scalameta_common": { "artifact": "org.scalameta:common_2.11:4.3.22", "sha256": "eaf3bc9c5168a52b4da0e1d39ea1ef2570a675b7de56cce7f64389835b20ac09", @@ -465,6 +519,15 @@ artifacts = { "@org_scalameta_fastparse", ], }, + "org_scalatestplus_scalacheck_1_14": { + "artifact": "org.scalatestplus:scalacheck-1-14_2.11:3.1.1.1", + "sha256": "1acd4045cc97e19bc0cdbdfba387be421dfe9406564834b509a1e3cf3c50cb43", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@io_bazel_rules_scala_scalatest", + "@org_scalacheck_scalacheck", + ], + }, "org_springframework_spring_core": { "testonly": True, "artifact": "org.springframework:spring-core:5.1.5.RELEASE", @@ -503,72 +566,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -587,8 +773,15 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.11:0.9.7", @@ -616,7 +809,13 @@ artifacts = { ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.11:0.9.7", - "sha256": "24d19df500ce6450d8f7aa72a9bad675fa4f3650f7736d548aa714058f887e23", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.11:0.9.8", + "sha256": "6541e7f62c03dd6e63a77943c568b0719b3137e0ada135ad3ef045f7f99eb953", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index 367440ba0..f82665864 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -45,6 +45,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -58,6 +77,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -93,9 +116,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -390,9 +428,17 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.11.0", - "sha256": "7bf170604a148a342c7d1b1c7d181dd41e9c60b7b459dd49b2bcf12be69ea675", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.12:2.12.0", + "sha256": "1619c5e4399e1e4793667970aae232652db0549e795c90abf91e44c55ec37cb3", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -533,72 +579,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -617,36 +786,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.9.7", "sha256": "516ed567e2c3ac28b91a2f350d3febc7a6a396978718145f536853ffe8de40c2", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.12:0.9.8", - "sha256": "00e59530efd8b736bcf67e093c3d6354aaacc660180e609141813708266e79be", + "artifact": "com.thesamet.scalapb:lenses_2.12:0.11.17", + "sha256": "c984f7695e9a5034afbf725b7eab919fc00bb24dc30c8f6f923d6d32096a1fa0", "deps": [ "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.12:0.7.14", - "sha256": "2b8db0b71be5052768a96ccc41c9bb03f3f19e1e267e810a64963566538b1a2b", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.12:0.9.7", + "sha256": "6d039a28d29253ac78aec0e3102f6423d269e65203c114a17f0d52a91d4876f4", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.9.8", - "sha256": "461bd923611e1ff0fdfaa1eb5f50912e4b547d21375e28c83f8b8d45df2913a1", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.17", + "sha256": "6624beb8e47c11de33262f867dd86d25e66ddce5507c9c13bfd7cc2f2e7652fe", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.9.7", - "sha256": "4c00f2a57cc1d00a2d454f695c3f1e565173e1d1297294f1cf81339bdeba3f4a", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.17", + "sha256": "7919fbb62f3ae9de9eec3a102b24dc1ef570ff098d1e41e464cf2ac7398cff5f", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 7c89eccc7..0b7045bee 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -97,9 +120,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -408,13 +446,21 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -555,72 +601,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -639,36 +808,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index ba16faf8f..e49a89b80 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -101,9 +124,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -419,6 +457,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", @@ -450,8 +496,8 @@ artifacts = { ], }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -597,72 +643,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -681,36 +850,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library_2", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index 2d08533a8..b72a22bb4 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -101,9 +124,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -419,6 +457,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", @@ -450,8 +496,8 @@ artifacts = { ], }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -597,72 +643,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -681,36 +850,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library_2", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 21ed73092..2a35f0c46 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -101,9 +124,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -420,6 +458,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", @@ -451,8 +497,8 @@ artifacts = { ], }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -598,72 +644,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -682,36 +851,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library_2", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index 21f377149..23666202e 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -101,9 +124,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -420,6 +458,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", @@ -451,8 +497,8 @@ artifacts = { ], }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -598,72 +644,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -682,36 +851,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library_2", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index abc21ff71..45f323d33 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -41,6 +41,25 @@ artifacts = { "artifact": "com.github.jnr:jffi:jar:native:1.2.17", "sha256": "4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9", }, + "com_google_android_annotations": { + "artifact": "com.google.android:annotations:4.1.1.4", + "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + }, + "com_google_code_findbugs_jsr305": { + "artifact": "com.google.code.findbugs:jsr305:3.0.2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + }, + "com_google_code_gson_gson": { + "artifact": "com.google.code.gson:gson:2.11.0", + "sha256": "57928d6e5a6edeb2abd3770a8f95ba44dce45f3b23b7a9dc2b309c581552a78b", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + ], + }, + "com_google_errorprone_error_prone_annotations": { + "artifact": "com.google.errorprone:error_prone_annotations:2.28.0", + "sha256": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e", + }, "com_google_guava_guava_21_0": { "testonly": True, "artifact": "com.google.guava:guava:21.0", @@ -54,6 +73,10 @@ artifacts = { "artifact": "com.google.guava:guava:21.0", "sha256": "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480", }, + "com_google_j2objc_j2objc_annotations": { + "artifact": "com.google.j2objc:j2objc-annotations:3.0.0", + "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + }, "com_google_protobuf_protobuf_java": { "artifact": "com.google.protobuf:protobuf-java:4.28.3", "sha256": "ba02977c0fef8b40af9f85fe69af362d8e13f2685b49a9752750b18da726157e", @@ -101,9 +124,24 @@ artifacts = { "artifact": "com.typesafe:config:1.4.1", "sha256": "4c0aa7e223c75c8840c41fc183d4cd3118140a1ee503e3e08ce66ed2794c948f", }, + "dev_dirs_directories": { + "artifact": "dev.dirs:directories:26", + "sha256": "6d18fe25aa30b7e08b908cd21151d8f96e22965c640acd7751add9bbfe6137d4", + }, + "io_bazel_rules_scala_failureaccess": { + "artifact": "com.google.guava:failureaccess:1.0.2", + "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", + }, "io_bazel_rules_scala_guava": { - "artifact": "com.google.guava:guava:26.0-android", - "sha256": "1d044ebb866ef08b7d04e998b4260c9b52fab6e6d6b68d207859486bb3686cd5", + "artifact": "com.google.guava:guava:33.3.1-jre", + "sha256": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@com_google_j2objc_j2objc_annotations", + "@io_bazel_rules_scala_failureaccess", + "@org_checkerframework_checker_qual", + ], }, "io_bazel_rules_scala_javax_annotation_api": { "artifact": "javax.annotation:javax.annotation-api:1.3.2", @@ -420,6 +458,14 @@ artifacts = { "artifact": "org.apache.commons:commons-lang3:3.5", "sha256": "8ac96fc686512d777fca85e144f196cd7cfe0c0aec23127229497d1a38ff651c", }, + "org_checkerframework_checker_qual": { + "artifact": "org.checkerframework:checker-qual:3.43.0", + "sha256": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6", + }, + "org_codehaus_mojo_animal_sniffer_annotations": { + "artifact": "org.codehaus.mojo:animal-sniffer-annotations:1.24", + "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", + }, "org_jline_jline": { "artifact": "org.jline:jline:3.27.1", "sha256": "72fcbc58da05092067739ded62ed6b1ba9075ecd0fee1caa634c2cbf1a16fe7a", @@ -451,8 +497,8 @@ artifacts = { ], }, "org_scala_lang_modules_scala_collection_compat": { - "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.11.0", - "sha256": "0c1108883b7b97851750e8932f9584346ccb23f1260c197f97295ac2e6c56cec", + "artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", + "sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -598,72 +644,195 @@ artifacts = { "sha256": "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0", }, "scala_proto_rules_grpc_api": { - "artifact": "io.grpc:grpc-api:1.24.0", - "sha256": "553978366e04ee8ddba64afde3b3cf2ac021a2f3c2db2831b6491d742b558598", + "artifact": "io.grpc:grpc-api:1.68.1", + "sha256": "d88d815e07fe58a7572dda5d2823485b61706564f289a1e74281705d50ac2d5b", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + ], }, "scala_proto_rules_grpc_context": { - "artifact": "io.grpc:grpc-context:1.24.0", - "sha256": "1f0546e18789f7445d1c5a157010a11bc038bbb31544cdb60d9da3848efcfeea", + "artifact": "io.grpc:grpc-context:1.68.1", + "sha256": "1df4f0310a7e7836bc2948afa95105f5ee27b5d468488aded74e7ff620359076", + "deps": [ + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_core": { - "artifact": "io.grpc:grpc-core:1.24.0", - "sha256": "8fc900625a9330b1c155b5423844d21be0a5574fe218a63170a16796c6f7880e", + "artifact": "io.grpc:grpc-core:1.68.1", + "sha256": "e1eddfe433aa850783cb6af9ad6da1ad3dfe2fb9b4c385b9a98d7a596e4d382a", + "deps": [ + "@com_google_android_annotations", + "@com_google_code_gson_gson", + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_context", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_netty": { - "artifact": "io.grpc:grpc-netty:1.24.0", - "sha256": "8478333706ba442a354c2ddb8832d80a5aef71016e8a9cf07e7bf6e8c298f042", + "artifact": "io.grpc:grpc-netty:1.68.1", + "sha256": "1bf33f36496c4fffa7b83cab9215ab2967f00e483270d87f1c17b23e5722a13f", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + "@scala_proto_rules_grpc_util", + "@scala_proto_rules_netty_codec_http2", + "@scala_proto_rules_netty_handler_proxy", + "@scala_proto_rules_netty_transport_native_unix_common", + "@scala_proto_rules_perfmark_api", + ], }, "scala_proto_rules_grpc_protobuf": { - "artifact": "io.grpc:grpc-protobuf:1.24.0", - "sha256": "88cd0838ea32893d92cb214ea58908351854ed8de7730be07d5f7d19025dd0bc", + "artifact": "io.grpc:grpc-protobuf:1.68.1", + "sha256": "75329d9aa328a0b1feef6803d59b93b527bceed9c97ceaaa0f8bd2d78ce98d14", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_protobuf_lite", + "@scala_proto_rules_proto_google_common_protos", + ], + }, + "scala_proto_rules_grpc_protobuf_lite": { + "artifact": "io.grpc:grpc-protobuf-lite:1.68.1", + "sha256": "f039759f64d365e7495a05bebee938713c85720236b91f628c21a7c3bc7f98de", + "deps": [ + "@com_google_code_findbugs_jsr305", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], }, "scala_proto_rules_grpc_stub": { - "artifact": "io.grpc:grpc-stub:1.24.0", - "sha256": "eaa9201896a77a0822e26621b538c7154f00441a51c9b14dc9e1ec1f2acfb815", + "artifact": "io.grpc:grpc-stub:1.68.1", + "sha256": "3d0260ba925cdeb63930b672daac815245f1c76d67ec111dd82e4dac6c9abd47", + "deps": [ + "@com_google_errorprone_error_prone_annotations", + "@io_bazel_rules_scala_guava", + "@scala_proto_rules_grpc_api", + ], + }, + "scala_proto_rules_grpc_util": { + "artifact": "io.grpc:grpc-util:1.68.1", + "sha256": "d489e40de9209981272fb9e7b0f61a5f0e5c1ce230195a5f23fb1078cd1baade", + "deps": [ + "@io_bazel_rules_scala_guava", + "@org_codehaus_mojo_animal_sniffer_annotations", + "@scala_proto_rules_grpc_api", + "@scala_proto_rules_grpc_core", + ], }, "scala_proto_rules_instrumentation_api": { "artifact": "com.google.instrumentation:instrumentation-api:0.3.0", "sha256": "671f7147487877f606af2c7e39399c8d178c492982827305d3b1c7f5b04f1145", }, "scala_proto_rules_netty_buffer": { - "artifact": "io.netty:netty-buffer:4.1.32.Final", - "sha256": "8ac0e30048636bd79ae205c4f9f5d7544290abd3a7ed39d8b6d97dfe3795afc1", + "artifact": "io.netty:netty-buffer:4.1.110.Final", + "sha256": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_codec": { - "artifact": "io.netty:netty-codec:4.1.32.Final", - "sha256": "dbd6cea7d7bf5a2604e87337cb67c9468730d599be56511ed0979aacb309f879", + "artifact": "io.netty:netty-codec:4.1.110.Final", + "sha256": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http": { - "artifact": "io.netty:netty-codec-http:4.1.32.Final", - "sha256": "db2c22744f6a4950d1817e4e1a26692e53052c5d54abe6cceecd7df33f4eaac3", + "artifact": "io.netty:netty-codec-http:4.1.110.Final", + "sha256": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_http2": { - "artifact": "io.netty:netty-codec-http2:4.1.32.Final", - "sha256": "4d4c6cfc1f19efb969b9b0ae6cc977462d202867f7dcfee6e9069977e623a2f5", + "artifact": "io.netty:netty-codec-http2:4.1.110.Final", + "sha256": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_handler", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_codec_socks": { - "artifact": "io.netty:netty-codec-socks:4.1.32.Final", - "sha256": "fe2f2e97d6c65dc280623dcfd24337d8a5c7377049c120842f2c59fb83d7408a", + "artifact": "io.netty:netty-codec-socks:4.1.110.Final", + "sha256": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_common": { - "artifact": "io.netty:netty-common:4.1.32.Final", - "sha256": "cc993e660f8f8e3b033f1d25a9e2f70151666bdf878d460a6508cb23daa696dc", + "artifact": "io.netty:netty-common:4.1.110.Final", + "sha256": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", }, "scala_proto_rules_netty_handler": { - "artifact": "io.netty:netty-handler:4.1.32.Final", - "sha256": "07d9756e48b5f6edc756e33e8b848fb27ff0b1ae087dab5addca6c6bf17cac2d", + "artifact": "io.netty:netty-handler:4.1.110.Final", + "sha256": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + "@scala_proto_rules_netty_transport", + "@scala_proto_rules_netty_transport_native_unix_common", + ], }, "scala_proto_rules_netty_handler_proxy": { - "artifact": "io.netty:netty-handler-proxy:4.1.32.Final", - "sha256": "10d1081ed114bb0e76ebbb5331b66a6c3189cbdefdba232733fc9ca308a6ea34", + "artifact": "io.netty:netty-handler-proxy:4.1.110.Final", + "sha256": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_codec", + "@scala_proto_rules_netty_codec_http", + "@scala_proto_rules_netty_codec_socks", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_netty_resolver": { - "artifact": "io.netty:netty-resolver:4.1.32.Final", - "sha256": "9b4a19982047a95ea4791a7ad7ad385c7a08c2ac75f0a3509cc213cb32a726ae", + "artifact": "io.netty:netty-resolver:4.1.110.Final", + "sha256": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "deps": [ + "@scala_proto_rules_netty_common", + ], }, "scala_proto_rules_netty_transport": { - "artifact": "io.netty:netty-transport:4.1.32.Final", - "sha256": "175bae0d227d7932c0c965c983efbb3cf01f39abe934f5c4071d0319784715fb", + "artifact": "io.netty:netty-transport:4.1.110.Final", + "sha256": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_resolver", + ], + }, + "scala_proto_rules_netty_transport_native_unix_common": { + "artifact": "io.netty:netty-transport-native-unix-common:4.1.110.Final", + "sha256": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "deps": [ + "@scala_proto_rules_netty_buffer", + "@scala_proto_rules_netty_common", + "@scala_proto_rules_netty_transport", + ], }, "scala_proto_rules_opencensus_api": { "artifact": "io.opencensus:opencensus-api:0.22.1", @@ -682,36 +851,55 @@ artifacts = { "sha256": "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68", }, "scala_proto_rules_perfmark_api": { - "artifact": "io.perfmark:perfmark-api:0.17.0", - "sha256": "816c11409b8a0c6c9ce1cda14bed526e7b4da0e772da67c5b7b88eefd41520f9", + "artifact": "io.perfmark:perfmark-api:0.27.0", + "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", + }, + "scala_proto_rules_proto_google_common_protos": { + "artifact": "com.google.api.grpc:proto-google-common-protos:2.48.0", + "sha256": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "deps": [ + "@com_google_protobuf_protobuf_java", + ], }, "scala_proto_rules_scalapb_compilerplugin": { "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", }, "scala_proto_rules_scalapb_lenses": { - "artifact": "com.thesamet.scalapb:lenses_2.13:0.9.8", - "sha256": "ec82e4d41487165c5dc52ef5e0ebd8565550b02e23583a8fbf5f87d6be90583a", + "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", + "sha256": "4abe3fe573b8505a633414b0fbbcae4240250690ba48a9d4a6eeb3dfc3302ddf", "deps": [ "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", ], }, "scala_proto_rules_scalapb_protoc_bridge": { - "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.14", - "sha256": "0704f2379374205e7130018e3df6b3d50a4d330c3e447ca39b5075ecb4c93cd1", + "artifact": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.7", + "sha256": "403f0e7223c8fd052cff0fbf977f3696c387a696a3a12d7b031d95660c7552f5", + "deps": [ + "@dev_dirs_directories", + "@io_bazel_rules_scala_scala_library_2", + ], }, "scala_proto_rules_scalapb_runtime": { - "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.8", - "sha256": "622282915e669a175fa1e1e647985c1e9bd0dbb143836bb8f7943a3e8138c46d", + "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", + "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", "deps": [ "@com_google_protobuf_protobuf_java", - "@com_lihaoyi_fastparse", "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", "@scala_proto_rules_scalapb_lenses", ], }, "scala_proto_rules_scalapb_runtime_grpc": { - "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.7", - "sha256": "950984d4a3b21925d3156dd98cddb4e7c2f429aad81aa25bb5a3792d41fd7c76", + "artifact": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.17", + "sha256": "c03687c038f2a45bb413551519542069a59faf322de29fd1f9e06f2dd65003d0", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_grpc_protobuf", + "@scala_proto_rules_grpc_stub", + "@scala_proto_rules_scalapb_runtime", + ], }, } From 8060da1daff92c25fd3231a4ae67f68ce9bde51a Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Wed, 6 Nov 2024 21:51:17 -0500 Subject: [PATCH 2/9] Update scala_proto repositories for Scala 2.11 Since Scala 2.11 is stuck on ScalaPB 0.9.8, its dependencies don't include the `dev.dirs:directories` artifact. Before this change, building with `--repo_env=SCALA_VERSION=2.11.12 would die with: ```txt $ bazel build --repo_env=SCALA_VERSION=2.11.12 \ //src/... //test/... //third_party/... //scala_proto/... ERROR: Traceback (most recent call last): File "/Users/mbland/src/bazelbuild/rules_scala/WORKSPACE", line 75, column 25, in scala_proto_repositories() File "/Users/mbland/src/bazelbuild/rules_scala/scala_proto/scala_proto.bzl", line 17, column 37, in scala_proto_repositories scala_proto_default_repositories(**kwargs) File "/Users/mbland/src/bazelbuild/rules_scala/scala_proto/default/repositories.bzl", line 7, column 17, in scala_proto_default_repositories repositories( File "/Users/mbland/src/bazelbuild/rules_scala/third_party/repositories/repositories.bzl", line 107, column 17, in repositories fail("artifact %s not in third_party/repositories/scala_%s.bzl" % ( Error in fail: artifact dev_dirs_directories not in third_party/repositories/scala_2_11.bzl ERROR: Error computing the main repository mapping: Encountered error while reading extension file 'go/deps.bzl': no such package '@io_bazel_rules_go//go': error loading package 'external': Could not load //external package ``` This is a preview of scala_proto toolchainization, given the addition of `scala_version` and `register_toolchains` parameters to `scala_proto_default_repositories`. --- scala_proto/default/repositories.bzl | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scala_proto/default/repositories.bzl b/scala_proto/default/repositories.bzl index cd32c69e5..06402b8d9 100644 --- a/scala_proto/default/repositories.bzl +++ b/scala_proto/default/repositories.bzl @@ -1,11 +1,16 @@ load("//scala:scala_cross_version.bzl", "default_maven_server_urls") load("//third_party/repositories:repositories.bzl", "repositories") +load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION") def scala_proto_default_repositories( maven_servers = default_maven_server_urls(), - overriden_artifacts = {}): + scala_version = SCALA_VERSION, + overriden_artifacts = {}, + register_toolchains = True): repositories( - for_artifact_ids = [ + for_artifact_ids = ([] if SCALA_VERSION.startswith("2.11.") else [ + "dev_dirs_directories", + ]) + [ "com_google_android_annotations", "com_google_code_findbugs_jsr305", "com_google_code_gson_gson", @@ -14,7 +19,6 @@ def scala_proto_default_repositories( "com_google_protobuf_protobuf_java", "com_lihaoyi_fastparse", "com_lihaoyi_sourcecode", - "dev_dirs_directories", "io_bazel_rules_scala_failureaccess", "io_bazel_rules_scala_guava", "org_codehaus_mojo_animal_sniffer_annotations", @@ -57,4 +61,7 @@ def scala_proto_default_repositories( overriden_artifacts = overriden_artifacts, ) - native.register_toolchains("@io_bazel_rules_scala//scala_proto:default_deps_toolchain") + if register_toolchains: + native.register_toolchains( + str(Label("//scala_proto:default_deps_toolchain")), + ) From 01ac301577b6b8ffe3180af8d2a2a31efcbb3507 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 7 Nov 2024 19:24:49 -0500 Subject: [PATCH 3/9] Add scalapb:compilerplugin to root artifacts Without this, the `com.thesamet.scalapb:compilerplugin` artifact is out of sync with other ScalaPB artifacts, leading to this error: ```txt $ bazel build //test/proto_cross_repo_boundary/... ERROR: .../external/proto_cross_repo_boundary/BUILD.bazel:3:14: scala @proto_cross_repo_boundary//:sample_proto failed: (Exit 1): scalac failed: error executing command (from target @proto_cross_repo_boundary//:sample_proto) bazel-out/.../bin/src/java/io/bazel/rulesscala/scalac/scalac @bazel-out/.../bin/external/proto_cross_repo_boundary/sample_proto_scalapb.jar-0.params bazel-out/.../bin/external/proto_cross_repo_boundary/_scalac/sample_proto/sources/1_sample_proto_scala_scalapb.srcjar/sample/sample/Sample.scala:11: error: class Any needs to be a trait to be mixed in ) extends scalapb.GeneratedMessage with scalapb.Message[Sample] with scalapb.lenses.Updatable[Sample] { ^ Target //test/proto_cross_repo_boundary:sample_scala_proto failed to build ``` --- scala_proto/default/repositories.bzl | 1 + scripts/create_repository.py | 2 ++ third_party/repositories/scala_2_11.bzl | 9 +++++++-- third_party/repositories/scala_2_12.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_2_13.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_3_1.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_3_2.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_3_3.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_3_4.bzl | 18 ++++++++++++++++-- third_party/repositories/scala_3_5.bzl | 18 ++++++++++++++++-- 10 files changed, 122 insertions(+), 16 deletions(-) diff --git a/scala_proto/default/repositories.bzl b/scala_proto/default/repositories.bzl index 06402b8d9..8ba94a86b 100644 --- a/scala_proto/default/repositories.bzl +++ b/scala_proto/default/repositories.bzl @@ -10,6 +10,7 @@ def scala_proto_default_repositories( repositories( for_artifact_ids = ([] if SCALA_VERSION.startswith("2.11.") else [ "dev_dirs_directories", + "scala_proto_rules_scalapb_protoc_gen", ]) + [ "com_google_android_annotations", "com_google_code_findbugs_jsr305", diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 2741b67ad..cd9c95dc9 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -96,6 +96,8 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]: GRPC_COMMON_PROTOS_VERSION, f'com.google.guava:guava:{GUAVA_VERSION}', f'com.google.protobuf:protobuf-java:{PROTOBUF_JAVA_VERSION}', + f'com.thesamet.scalapb:compilerplugin_{scala_2_major}:' + + scalapb_version, f'com.thesamet.scalapb:protoc-bridge_{scala_2_major}:' + protoc_bridge_version, f'com.thesamet.scalapb:scalapb-runtime_{scala_2_major}:' + diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl index a5bcfa29d..2288d829b 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -784,8 +784,13 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.11:0.9.7", - "sha256": "2d6793fa2565953ef2b5094fc37fae4933f3c42e4cb4048d54e7f358ec104a87", + "artifact": "com.thesamet.scalapb:compilerplugin_2.11:0.9.8", + "sha256": "9fda69065da447cf91aa3c923a95b80c2bdb9f46f95b2c14af97f533b099b5a9", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library", + "@scala_proto_rules_scalapb_protoc_bridge", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.11:0.9.8", diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index f82665864..d1dd6801d 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -797,8 +797,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.9.7", - "sha256": "516ed567e2c3ac28b91a2f350d3febc7a6a396978718145f536853ffe8de40c2", + "artifact": "com.thesamet.scalapb:compilerplugin_2.12:0.11.17", + "sha256": "a9dc6cc0dbe6ff53a7c914433d5a19711018217b432b385c97778cd4050210d0", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.12:0.11.17", @@ -816,6 +822,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.12:0.9.7", + "sha256": "81df11e24e52887515dff20eb4d1a050fd58e078200291c3c87fd04218abe53b", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.17", "sha256": "6624beb8e47c11de33262f867dd86d25e66ddce5507c9c13bfd7cc2f2e7652fe", diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 0b7045bee..34dff08dd 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -819,8 +819,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -838,6 +844,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index e49a89b80..1cbac6fad 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -861,8 +861,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -880,6 +886,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library_2", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index b72a22bb4..17abde490 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -861,8 +861,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -880,6 +886,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library_2", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 2a35f0c46..c08d87edb 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -862,8 +862,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -881,6 +887,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library_2", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index 23666202e..1243df449 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -862,8 +862,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -881,6 +887,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library_2", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index 45f323d33..3831ca750 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -862,8 +862,14 @@ artifacts = { ], }, "scala_proto_rules_scalapb_compilerplugin": { - "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.9.7", - "sha256": "ac29c2f01b0b1e39c4226915000505643d586234d586247e1fd97133e20bcc60", + "artifact": "com.thesamet.scalapb:compilerplugin_2.13:0.11.17", + "sha256": "d36b84059289c7aa2f2bf08eeab7e85084fcf72bf58b337edf167c73218880d7", + "deps": [ + "@com_google_protobuf_protobuf_java", + "@io_bazel_rules_scala_scala_library_2", + "@org_scala_lang_modules_scala_collection_compat", + "@scala_proto_rules_scalapb_protoc_gen", + ], }, "scala_proto_rules_scalapb_lenses": { "artifact": "com.thesamet.scalapb:lenses_2.13:0.11.17", @@ -881,6 +887,14 @@ artifacts = { "@io_bazel_rules_scala_scala_library_2", ], }, + "scala_proto_rules_scalapb_protoc_gen": { + "artifact": "com.thesamet.scalapb:protoc-gen_2.13:0.9.7", + "sha256": "f9943ce49261aad80a063c2ce55b01fb62cfd9487ffa2d36a2eade467bc16b23", + "deps": [ + "@io_bazel_rules_scala_scala_library_2", + "@scala_proto_rules_scalapb_protoc_bridge", + ], + }, "scala_proto_rules_scalapb_runtime": { "artifact": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "sha256": "fe91faf58bccef68be348e76cab339a5fe2c215e48f7bd8f836190449ed94077", From 876a5948134141e75b2a4f606c69da822d04a002 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Sun, 20 Oct 2024 18:52:18 -0400 Subject: [PATCH 4/9] Fix scalapb-runtime 0.11.17 errors There were API changes from scalapb-runtime 0.9.7 causing the following errors: ```txt ERROR: .../test/src/main/scala/scalarules/test/extra_protobuf_generator/BUILD:3:14: scala @//test/src/main/scala/scalarules/test/extra_protobuf_generator:extra_protobuf_generator failed: (Exit 1): scalac failed: error executing Scalac command (from target //test/src/main/scala/scalarules/test/extra_protobuf_generator:extra_protobuf_generator) bazel-out/darwin_arm64-opt-exec-ST-a828a81199fe/bin/src/java/io/bazel/rulesscala/scalac/scalac ... (remaining 1 argument skipped) test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala:20: error: value nameSymbol is not a member of com.google.protobuf.Descriptors.Descriptor .add(s"final case object Custom${message.nameSymbol}{}") ^ test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala:34: error: value fileDescriptorObjectName is not a member of com.google.protobuf.Descriptors.FileDescriptor b.setName(file.scalaDirectory + "/Custom" + file.fileDescriptorObjectName + ".scala") ^ test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala:66: error: value FileDescriptorPimp is not a member of scalapb.compiler.DescriptorImplicits import implicits.FileDescriptorPimp ^ ``` Since Scala 2.11 can't advance past scalapb-runtime 0.9.8, we use `select_for_scala_version` to select the appropriate `ProtobufAdapter` to maintain API compatibility. Also, `import implicits.FileDescriptorPimp` turned out to be unnecessary after all, even under Scala 2.11. --- .../scalarules/test/extra_protobuf_generator/BUILD | 6 +++++- .../ExtraProtobufGenerator.scala | 10 +++++++--- .../extra_protobuf_generator/ProtobufAdapter.scala | 13 +++++++++++++ .../ProtobufAdapter_2_11.scala | 13 +++++++++++++ 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter.scala create mode 100644 test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter_2_11.scala diff --git a/test/src/main/scala/scalarules/test/extra_protobuf_generator/BUILD b/test/src/main/scala/scalarules/test/extra_protobuf_generator/BUILD index b14f392ee..83c27918b 100644 --- a/test/src/main/scala/scalarules/test/extra_protobuf_generator/BUILD +++ b/test/src/main/scala/scalarules/test/extra_protobuf_generator/BUILD @@ -1,8 +1,12 @@ load("//scala:scala.bzl", "scala_library") +load("//scala:scala_cross_version_select.bzl", "select_for_scala_version") scala_library( name = "extra_protobuf_generator", - srcs = ["ExtraProtobufGenerator.scala"], + srcs = select_for_scala_version( + any_2_11 = ["ProtobufAdapter_2_11.scala"], + since_2_12 = ["ProtobufAdapter.scala"], + ) + ["ExtraProtobufGenerator.scala"], visibility = ["//visibility:public"], deps = [ "//scala_proto:scalapb_worker_deps", diff --git a/test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala index bc83e37af..9fdadf9c8 100644 --- a/test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala +++ b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ExtraProtobufGenerator.scala @@ -15,9 +15,11 @@ class CustomProtobufGenerator( import implicits._ import ProtobufGenerator._ + val protobufAdapter = new ProtobufAdapter(implicits) + def printCustomMessage(printer: FunctionalPrinter, message: Descriptor): FunctionalPrinter = { printer - .add(s"final case object Custom${message.nameSymbol}{}") + .add(s"final case object Custom${protobufAdapter.nameSymbol(message)}{}") } override def generateSingleScalaFileForFileDescriptor( @@ -31,7 +33,10 @@ class CustomProtobufGenerator( .result() val b = CodeGeneratorResponse.File.newBuilder() - b.setName(file.scalaDirectory + "/Custom" + file.fileDescriptorObjectName + ".scala") + b.setName( + file.scalaDirectory + "/Custom" + + protobufAdapter.fileDescriptorObjectName(file) + ".scala" + ) b.setContent(code) List(b.build) } @@ -79,7 +84,6 @@ object ExtraProtobufGenerator extends ProtocCodeGenerator { val generator = new CustomProtobufGenerator(params, implicits) val validator = new ProtoValidation(implicits) validator.validateFiles(filesByName.values.toSeq) - import implicits.FileDescriptorPimp request.getFileToGenerateList.asScala.foreach { name => val file = filesByName(name) val responseFiles = diff --git a/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter.scala b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter.scala new file mode 100644 index 000000000..83f4b8f01 --- /dev/null +++ b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter.scala @@ -0,0 +1,13 @@ +package scalarules.test.extra_protobuf_generator + +import com.google.protobuf.Descriptors.{Descriptor, FileDescriptor} +import scalapb.compiler.DescriptorImplicits + +class ProtobufAdapter(implicits: DescriptorImplicits) { + import implicits._ + + def nameSymbol(message: Descriptor): String = message.scalaType.nameSymbol + + def fileDescriptorObjectName(file: FileDescriptor): String = + file.fileDescriptorObject.name +} diff --git a/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter_2_11.scala b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter_2_11.scala new file mode 100644 index 000000000..ad60617a0 --- /dev/null +++ b/test/src/main/scala/scalarules/test/extra_protobuf_generator/ProtobufAdapter_2_11.scala @@ -0,0 +1,13 @@ +package scalarules.test.extra_protobuf_generator + +import com.google.protobuf.Descriptors.{Descriptor, FileDescriptor} +import scalapb.compiler.DescriptorImplicits + +class ProtobufAdapter(implicits: DescriptorImplicits) { + import implicits._ + + def nameSymbol(message: Descriptor): String = message.nameSymbol + + def fileDescriptorObjectName(file: FileDescriptor): String = + file.fileDescriptorObjectName +} From c61501d8724c7497d30850c72cd94e17feb886a7 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 7 Nov 2024 19:43:20 -0500 Subject: [PATCH 5/9] Add `null` as dummy `TestMessage` parameter Fixes the `test_demonstrate_INCORRECT_scala_proto_library_stamp` test case from `test/shell/test_strict_dependency.sh` after the ScalaPB 0.11.17 bump. Somehow, bumping that library (presumably, instead of gRPC, et. al.) changed the parameter list of `TestMessage` from `String` to `String,UnknownFieldSet`. The test then failed because the following command produced this unexpected error: ```txt $ bazel build --verbose_failures \ //test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto \ --extra_toolchains=//test/toolchains:ast_plus_one_deps_strict_deps_error ERROR: .../test_expect_failure/missing_direct_deps/scala_proto_deps/BUILD:25:13: Building test_expect_failure/missing_direct_deps/scala_proto_deps/libtransitive.jar (1 source file) failed: (Exit 1): java failed: error executing command (from target //test_expect_failure/missing_direct_deps/scala_proto_deps:transitive) (cd ... [ ...snip... ] external/remotejdk11_macos_aarch64/bin/java -XX:-CompactStrings [ ...snip... ] external/remote_java_tools/java_tools/JavaBuilder_deploy.jar @bazel-out/.../bin/test_expect_failure/missing_direct_deps/scala_proto_deps/libtransitive.jar-0.params @bazel-out/.../bin/test_expect_failure/missing_direct_deps/scala_proto_deps/libtransitive.jar-1.params) test_expect_failure/missing_direct_deps/scala_proto_deps/UseTestMessage.java:7: error: constructor TestMessage in class TestMessage cannot be applied to given types; private final TestMessage m = new TestMessage(""); ^ required: String,UnknownFieldSet found: String reason: actual and formal argument lists differ in length ``` After this change, the same command produces the following failure that the test is expecting to catch: ```txt ERROR: .../test_expect_failure/missing_direct_deps/scala_proto_deps/BUILD:18:14: scala @//test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto failed: (Exit 1): scalac failed: error executing command (from target //test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto) (cd .../execroot/io_bazel_rules_scala && \ exec env - \ bazel-out/.../bin/src/java/io/bazel/rulesscala/scalac/scalac @bazel-out/.../bin/test_expect_failure/missing_direct_deps/scala_proto_deps/uses_transitive_scala_proto.jar-0.params) test_expect_failure/missing_direct_deps/scala_proto_deps/UseScalaProtoIndirectly.scala:6: error: Target '@//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' is used but isn't explicitly declared, please add it to the deps. You can use the following buildozer command: buildozer 'add deps @//test_expect_failure/missing_direct_deps/scala_proto_deps:some_proto' //test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto val foo: TestMessage = new UseTestMessage().getM ^ one error found Build failure with errors. Target //test_expect_failure/missing_direct_deps/scala_proto_deps:uses_transitive_scala_proto failed to build ``` --- .../missing_direct_deps/scala_proto_deps/UseTestMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_expect_failure/missing_direct_deps/scala_proto_deps/UseTestMessage.java b/test_expect_failure/missing_direct_deps/scala_proto_deps/UseTestMessage.java index 340846da1..684184e84 100644 --- a/test_expect_failure/missing_direct_deps/scala_proto_deps/UseTestMessage.java +++ b/test_expect_failure/missing_direct_deps/scala_proto_deps/UseTestMessage.java @@ -4,7 +4,7 @@ public class UseTestMessage { - private final TestMessage m = new TestMessage(""); + private final TestMessage m = new TestMessage("", null); public TestMessage getM() { return m; From f25a555f94183b9940bc2983318b0a779228f3bf Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 7 Nov 2024 20:08:25 -0500 Subject: [PATCH 6/9] Remove unnecessary .getPlaintext() parameter Already did this for `test/TestServer.scala` as part of the gRPC bump. `test_version/version_specific_tests_dir/TestServer.scala` gets the same treatment now to fix `test_scala_version 2.11.12` from `test_version.sh`, which failed with: ``` ERROR: .../test_version/test_scala_version_1731027515/BUILD:161:14: scala @//:lib_with_scala_proto_dep failed: (Exit 1): scalac failed: error executing command (from target //:lib_with_scala_proto_dep) bazel-out/.../bin/external/io_bazel_rules_scala/src/java/io/bazel/rulesscala/scalac/scalac @bazel-out/.../bin/lib_with_scala_proto_dep.jar-0.params TestServer.scala:70: error: too many arguments for method usePlaintext: ()?0 val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build ^ ``` --- test_version/version_specific_tests_dir/TestServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_version/version_specific_tests_dir/TestServer.scala b/test_version/version_specific_tests_dir/TestServer.scala index 3a44df27f..850227f75 100644 --- a/test_version/version_specific_tests_dir/TestServer.scala +++ b/test_version/version_specific_tests_dir/TestServer.scala @@ -67,7 +67,7 @@ class TestServer(executionContext: ExecutionContext) { self => object TestClient { def apply(host: String, port: Int): TestClient = { - val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build + val channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build val blockingStub = TestServiceGrpc.blockingStub(channel) new TestClient(channel, blockingStub) } From 5be99513c674a8eb343b512f44965c441f0ae9e2 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 7 Nov 2024 20:37:46 -0500 Subject: [PATCH 7/9] Add org_scala_lang_modules_scala_collection_compat More specifically, add it to the list of core scala repository imports. It had been generated before, but somehow hadn't been required until now. With this change, all tests now pass after the ScalaPB 0.11.17, gRPC 1.68.1, and Guava 33.3.1-jre version bumps. Fixes the following error in `test_scala_version 2.12.20` from `test_version.sh`: ```txt ERROR: .../external/scala_proto_rules_scalapb_compilerplugin/BUILD:9:13: no such package '@org_scala_lang_modules_scala_collection_compat//': The repository '@org_scala_lang_modules_scala_collection_compat' could not be resolved: Repository '@org_scala_lang_modules_scala_collection_compat' is not defined and referenced by '@scala_proto_rules_scalapb_compilerplugin//:scala_proto_rules_scalapb_compilerplugin' ERROR: Analysis of target '//proto:test_proto_nogrpc' failed; build aborted: ``` --- scala/private/macros/scala_repositories.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl index c28e8e646..db342760a 100644 --- a/scala/private/macros/scala_repositories.bzl +++ b/scala/private/macros/scala_repositories.bzl @@ -181,6 +181,7 @@ def _artifact_ids(scala_version): "io_bazel_rules_scala_scala_library", "io_bazel_rules_scala_scala_parser_combinators", "io_bazel_rules_scala_scala_xml", + "org_scala_lang_modules_scala_collection_compat", ] if scala_version.startswith("2."): From de8214bc788bfa9b7cdb42793a9c195d0b674fec Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Sat, 9 Nov 2024 12:40:53 -0500 Subject: [PATCH 8/9] Wrap ScalaPbCodeGenerator, expose Scala 2.11 error Wraps `scalapb.ScalaPbCodeGenerator` to catch and return all errors. Without this, any errors escaping from `scalapb.ScalaPbCodeGenerator` will cause the `scala_proto` aspect workers to hang. Also deletes some `@io_bazel_rules_scala` references, replacing them with `Label` instances as appropriate. The `test_scala_version 2.11.12` case from `test_version.sh` would previously hang given the combination of ScalaPB 0.9.8 (the newest available for Scala 2.11) and Protobuf v28.3. Running the following in a `test_version/test_scala_version_*` repo generated by `test_version.sh` reproduced the hang: ```txt $ bazel build --repo_env=SCALA_VERSION=2.11.12 //proto:test_proto [ ...wait 10 seconds, then CTRL-C... ] INFO: Analyzed target //proto:test_proto (2 packages loaded, 22 targets configured). INFO: Found 1 target... [1,038 / 1,047] 4 actions running ProtoScalaPBRule proto/test_service_scala_scalapb.srcjar; 10s worker ProtoScalaPBRule proto/test2_scala_scalapb.srcjar; 10s worker Target //proto:test_proto failed to build ``` With this change, the command now exposes the exact incompatibility between these versions: ```txt $ bazel build --repo_env=SCALA_VERSION=2.11.12 //proto:test_proto ERROR: .../test_version/test_scala_version_1731169107/proto/BUILD:14:14: ProtoScalaPBRule proto/test3_scala_scalapb.srcjar failed: (Exit 1): scalapb_worker failed: error executing command (from target //proto:test3) bazel-out/.../bin/external/io_bazel_rules_scala/src/scala/scripts/scalapb_worker ... (remaining 2 arguments skipped) --scala_out: java.lang.NoSuchMethodError: 'void com.google.protobuf.Descriptors$FileDescriptor.internalBuildGeneratedFileFrom(java.lang.String[], com.google.protobuf.Descriptors$FileDescriptor[], com.google.protobuf.Descriptors$FileDescriptor$InternalDescriptorAssigner)' at scalapb.options.compiler.Scalapb.(Scalapb.java:10592) at scalapb.ScalaPbCodeGenerator$.run(ScalaPbCodeGenerator.scala:14) at scalapb.ScalaPbCodeGenerator$.run(ScalaPbCodeGenerator.scala:10) at scripts.ScalaPbCodeGenerator$.run(ScalaPbCodeGeneratorWrapper_2_11.scala:8) at protocbridge.frontend.PluginFrontend$$anonfun$runWithBytes$2.apply(PluginFrontend.scala:52) at protocbridge.frontend.PluginFrontend$$anonfun$runWithBytes$2.apply(PluginFrontend.scala:52) at scala.util.Try$.apply(Try.scala:192) at protocbridge.frontend.PluginFrontend$.runWithBytes(PluginFrontend.scala:51) at protocbridge.frontend.PluginFrontend$.runWithInputStream(PluginFrontend.scala:103) at protocbridge.frontend.PosixPluginFrontend$$anonfun$prepare$1.apply$mcV$sp(PosixPluginFrontend.scala:33) at protocbridge.frontend.PosixPluginFrontend$$anonfun$prepare$1.apply(PosixPluginFrontend.scala:31) at protocbridge.frontend.PosixPluginFrontend$$anonfun$prepare$1.apply(PosixPluginFrontend.scala:31) at scala.concurrent.impl.Future$PromiseCompletingRunnable.liftedTree1$1(Future.scala:24) at scala.concurrent.impl.Future$PromiseCompletingRunnable.run(Future.scala:24) at scala.concurrent.impl.ExecutionContextImpl$AdaptedForkJoinTask.exec(ExecutionContextImpl.scala:121) at scala.concurrent.forkjoin.ForkJoinTask.doExec(ForkJoinTask.java:260) at scala.concurrent.forkjoin.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1339) at scala.concurrent.forkjoin.ForkJoinPool.runWorker(ForkJoinPool.java:1979) at scala.concurrent.forkjoin.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:107) java.lang.RuntimeException: Exit with code 1 at scala.sys.package$.error(package.scala:27) at scripts.ScalaPBWorker$.work(ScalaPBWorker.scala:44) at io.bazel.rulesscala.worker.Worker.persistentWorkerMain(Worker.java:96) at io.bazel.rulesscala.worker.Worker.workerMain(Worker.java:49) at scripts.ScalaPBWorker$.main(ScalaPBWorker.scala:39) at scripts.ScalaPBWorker.main(ScalaPBWorker.scala) Target //proto:test_proto failed to build ``` --- scala_proto/BUILD | 19 +++++------- scala_proto/default/default_deps.bzl | 22 ++++++++++---- scala_proto/scala_proto_toolchain.bzl | 29 ++++++++++++++----- src/scala/scripts/BUILD | 13 +++++++++ .../scripts/ScalaPbCodeGeneratorWrapper.scala | 17 +++++++++++ .../ScalaPbCodeGeneratorWrapper_2_11.scala | 19 ++++++++++++ test/proto/custom_generator/BUILD.bazel | 25 +++++++--------- 7 files changed, 105 insertions(+), 39 deletions(-) create mode 100644 src/scala/scripts/ScalaPbCodeGeneratorWrapper.scala create mode 100644 src/scala/scripts/ScalaPbCodeGeneratorWrapper_2_11.scala diff --git a/scala_proto/BUILD b/scala_proto/BUILD index e924b1290..d97b07e76 100644 --- a/scala_proto/BUILD +++ b/scala_proto/BUILD @@ -1,15 +1,16 @@ -load( - "//scala_proto:scala_proto_toolchain.bzl", - "scala_proto_deps_toolchain", - "scala_proto_toolchain", -) +load("//scala:providers.bzl", "declare_deps_provider") load( "//scala_proto/default:default_deps.bzl", "DEFAULT_SCALAPB_COMPILE_DEPS", "DEFAULT_SCALAPB_GRPC_DEPS", + "DEFAULT_SCALAPB_WORKER_DEPS", ) -load("//scala:providers.bzl", "declare_deps_provider") load("//scala_proto/private:toolchain_deps.bzl", "export_scalapb_toolchain_deps") +load( + "//scala_proto:scala_proto_toolchain.bzl", + "scala_proto_deps_toolchain", + "scala_proto_toolchain", +) toolchain_type( name = "toolchain_type", @@ -80,11 +81,7 @@ declare_deps_provider( name = "scalapb_worker_deps_provider", deps_id = "scalapb_worker_deps", visibility = ["//visibility:public"], - deps = [ - "@com_google_protobuf//:protobuf_java", - "@scala_proto_rules_scalapb_compilerplugin", - "@scala_proto_rules_scalapb_protoc_bridge", - ], + deps = DEFAULT_SCALAPB_WORKER_DEPS, ) export_scalapb_toolchain_deps( diff --git a/scala_proto/default/default_deps.bzl b/scala_proto/default/default_deps.bzl index 2a6a95d29..db82f2869 100644 --- a/scala_proto/default/default_deps.bzl +++ b/scala_proto/default/default_deps.bzl @@ -1,11 +1,14 @@ # These are the compile/runtime dependencies needed for scalapb compilation # and grpc compile/runtime. # -# In a complex environment you may want to update the toolchain to not refer to these anymore -# If you are using a resolver (like bazel-deps) that can export compile + runtime jar paths -# for you, then you should only need much shorter dependency lists. This needs to be the unrolled -# transitive path to be used without such a facility. -# +# In a complex environment you may want to update the toolchain to not refer to +# these anymore If you are using a resolver (like bazel-deps) that can export +# compile + runtime jar paths for you, then you should only need much shorter +# dependency lists. This needs to be the unrolled transitive path to be used +# without such a facility. + +load("//scala:scala_cross_version_select.bzl", "select_for_scala_version") + DEFAULT_SCALAPB_COMPILE_DEPS = [ "//scala/private/toolchain_deps:scala_library_classpath", "@com_google_protobuf//:protobuf_java", @@ -41,3 +44,12 @@ DEFAULT_SCALAPB_GRPC_DEPS = [ "@scala_proto_rules_perfmark_api", "@scala_proto_rules_scalapb_runtime_grpc", ] + +DEFAULT_SCALAPB_WORKER_DEPS = [ + "@com_google_protobuf//:protobuf_java", + "@scala_proto_rules_scalapb_compilerplugin", + "@scala_proto_rules_scalapb_protoc_bridge", +] + select_for_scala_version( + any_2_11 = [], + since_2_12 = ["@scala_proto_rules_scalapb_protoc_gen"], +) diff --git a/scala_proto/scala_proto_toolchain.bzl b/scala_proto/scala_proto_toolchain.bzl index b546ffbb0..40f198ea3 100644 --- a/scala_proto/scala_proto_toolchain.bzl +++ b/scala_proto/scala_proto_toolchain.bzl @@ -1,4 +1,4 @@ -load("@io_bazel_rules_scala//scala:providers.bzl", "DepsInfo") +load("//scala:providers.bzl", "DepsInfo") def _generators(ctx): return dict( @@ -7,9 +7,12 @@ def _generators(ctx): ) def _generators_jars(ctx): + generator_deps = ctx.attr.extra_generator_dependencies + [ + ctx.attr._main_generator_dep, + ] return depset(transitive = [ dep[JavaInfo].transitive_runtime_jars - for dep in ctx.attr.extra_generator_dependencies + for dep in generator_deps ]) def _generators_opts(ctx): @@ -74,10 +77,12 @@ scala_proto_toolchain = rule( "code_generator": attr.label( executable = True, cfg = "exec", - default = Label("@io_bazel_rules_scala//src/scala/scripts:scalapb_worker"), + default = Label("//src/scala/scripts:scalapb_worker"), allow_files = True, ), - "main_generator": attr.string(default = "scalapb.ScalaPbCodeGenerator"), + "main_generator": attr.string( + default = "scripts.ScalaPbCodeGenerator", + ), "named_generators": attr.string_dict(), "extra_generator_dependencies": attr.label_list( providers = [JavaInfo], @@ -85,7 +90,7 @@ scala_proto_toolchain = rule( "scalac": attr.label( executable = True, cfg = "exec", - default = Label("@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac"), + default = Label("//src/java/io/bazel/rulesscala/scalac"), allow_files = True, ), "protoc": attr.label( @@ -105,6 +110,14 @@ scala_proto_toolchain = rule( [proto rules documentation](https://docs.bazel.build/versions/master/be/protocol-buffer.html#proto_library) """, ), + "_main_generator_dep": attr.label( + default = Label( + "//src/scala/scripts:scalapb_codegenerator_wrapper", + ), + allow_single_file = True, + executable = False, + cfg = "exec", + ), }, ) @@ -119,9 +132,9 @@ scala_proto_deps_toolchain = rule( attrs = { "dep_providers": attr.label_list( default = [ - "@io_bazel_rules_scala//scala_proto:scalapb_compile_deps_provider", - "@io_bazel_rules_scala//scala_proto:scalapb_grpc_deps_provider", - "@io_bazel_rules_scala//scala_proto:scalapb_worker_deps_provider", + Label("//scala_proto:scalapb_compile_deps_provider"), + Label("//scala_proto:scalapb_grpc_deps_provider"), + Label("//scala_proto:scalapb_worker_deps_provider"), ], cfg = "target", providers = [DepsInfo], diff --git a/src/scala/scripts/BUILD b/src/scala/scripts/BUILD index cd1643579..0e813301a 100644 --- a/src/scala/scripts/BUILD +++ b/src/scala/scripts/BUILD @@ -1,4 +1,5 @@ load("//scala:scala.bzl", "scala_binary", "scala_library") +load("//scala:scala_cross_version_select.bzl", "select_for_scala_version") scala_library( name = "scrooge_worker_lib", @@ -22,6 +23,18 @@ scala_binary( ], ) +scala_library( + name = "scalapb_codegenerator_wrapper", + srcs = select_for_scala_version( + any_2_11 = ["ScalaPbCodeGeneratorWrapper_2_11.scala"], + since_2_12 = ["ScalaPbCodeGeneratorWrapper.scala"], + ), + visibility = ["//visibility:public"], + deps = [ + "//scala_proto:scalapb_worker_deps", + ], +) + scala_library( name = "scalapb_worker_lib", srcs = ["ScalaPBWorker.scala"], diff --git a/src/scala/scripts/ScalaPbCodeGeneratorWrapper.scala b/src/scala/scripts/ScalaPbCodeGeneratorWrapper.scala new file mode 100644 index 000000000..0795d0df7 --- /dev/null +++ b/src/scala/scripts/ScalaPbCodeGeneratorWrapper.scala @@ -0,0 +1,17 @@ +package scripts + +import protocgen.{CodeGenApp,CodeGenRequest,CodeGenResponse} + +object ScalaPbCodeGenerator extends CodeGenApp { + def process(request: CodeGenRequest): CodeGenResponse = { + try { + scalapb.ScalaPbCodeGenerator.process(request) + + } catch { + case e: Throwable => + val stackStream = new java.io.ByteArrayOutputStream + e.printStackTrace(new java.io.PrintStream(stackStream)) + CodeGenResponse.fail(stackStream.toString()) + } + } +} diff --git a/src/scala/scripts/ScalaPbCodeGeneratorWrapper_2_11.scala b/src/scala/scripts/ScalaPbCodeGeneratorWrapper_2_11.scala new file mode 100644 index 000000000..5d5a1002b --- /dev/null +++ b/src/scala/scripts/ScalaPbCodeGeneratorWrapper_2_11.scala @@ -0,0 +1,19 @@ +package scripts +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse + +object ScalaPbCodeGenerator extends protocbridge.ProtocCodeGenerator { + override def run(req: Array[Byte]): Array[Byte] = { + try { + scalapb.ScalaPbCodeGenerator.run(req) + + } catch { + case e: Throwable => + val b = CodeGeneratorResponse.newBuilder + val stackStream = new java.io.ByteArrayOutputStream + + e.printStackTrace(new java.io.PrintStream(stackStream)) + b.setError(stackStream.toString()) + b.build.toByteArray + } + } +} diff --git a/test/proto/custom_generator/BUILD.bazel b/test/proto/custom_generator/BUILD.bazel index 213c1b557..0254afe4e 100644 --- a/test/proto/custom_generator/BUILD.bazel +++ b/test/proto/custom_generator/BUILD.bazel @@ -1,7 +1,12 @@ -load("//scala_proto:scala_proto.bzl", "scala_proto_library") -load("//scala:scala.bzl", "scala_library", "scala_test") load("//scala:providers.bzl", "declare_deps_provider") -load("//scala_proto:scala_proto_toolchain.bzl", "scala_proto_deps_toolchain", "scala_proto_toolchain") +load("//scala:scala.bzl", "scala_library", "scala_test") +load("//scala_proto/default:default_deps.bzl", "DEFAULT_SCALAPB_WORKER_DEPS") +load("//scala_proto:scala_proto.bzl", "scala_proto_library") +load( + "//scala_proto:scala_proto_toolchain.bzl", + "scala_proto_deps_toolchain", + "scala_proto_toolchain", +) # This package contains manual tests for custom generators: # @@ -38,12 +43,7 @@ scala_library( declare_deps_provider( name = "scalapb_worker_deps_provider", deps_id = "scalapb_worker_deps", - deps = [ - ":DummyGenerator", - "@com_google_protobuf//:protobuf_java", - "@scala_proto_rules_scalapb_compilerplugin", - "@scala_proto_rules_scalapb_protoc_bridge", - ], + deps = [":DummyGenerator"] + DEFAULT_SCALAPB_WORKER_DEPS, ) scala_proto_deps_toolchain( @@ -83,12 +83,7 @@ scala_library( declare_deps_provider( name = "failing_scalapb_worker_deps_provider", deps_id = "scalapb_worker_deps", - deps = [ - ":FailingGenerator", - "@com_google_protobuf//:protobuf_java", - "@scala_proto_rules_scalapb_compilerplugin", - "@scala_proto_rules_scalapb_protoc_bridge", - ], + deps = [":FailingGenerator"] + DEFAULT_SCALAPB_WORKER_DEPS, ) scala_proto_deps_toolchain( From e8d1f8b425e7be5307541174ec5ca11cc5290bc7 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Sun, 17 Nov 2024 12:10:54 -0500 Subject: [PATCH 9/9] Extract `scala_proto_artifact_ids` This will support the upcoming schema whereby `scala_toolchains` will import all artifact IDs via macros like this, and invoke `repositories` itself. This will avoid instantiating the same artifact repository multiple times for different frameworks that depend on it. Under `WORKSPACE`, this isn't a problem, but it's an error under Bzlmod, as a module extension can only instantiate a repository once. The commit message to toolchainize Scalafmt will provide more details on this. --- scala_proto/BUILD | 4 +- scala_proto/default/repositories.bzl | 120 +++++++++++++++------------ 2 files changed, 67 insertions(+), 57 deletions(-) diff --git a/scala_proto/BUILD b/scala_proto/BUILD index d97b07e76..c240430d8 100644 --- a/scala_proto/BUILD +++ b/scala_proto/BUILD @@ -38,7 +38,7 @@ scala_proto_toolchain( toolchain( name = "default_toolchain", toolchain = ":default_toolchain_impl", - toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type", + toolchain_type = "//scala_proto:toolchain_type", visibility = ["//visibility:public"], ) @@ -59,7 +59,7 @@ scala_proto_toolchain( toolchain( name = "enable_all_options_toolchain", toolchain = ":enable_all_options_toolchain_impl", - toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type", + toolchain_type = "//scala_proto:toolchain_type", visibility = ["//visibility:public"], ) diff --git a/scala_proto/default/repositories.bzl b/scala_proto/default/repositories.bzl index 8ba94a86b..f56f21d23 100644 --- a/scala_proto/default/repositories.bzl +++ b/scala_proto/default/repositories.bzl @@ -2,67 +2,77 @@ load("//scala:scala_cross_version.bzl", "default_maven_server_urls") load("//third_party/repositories:repositories.bzl", "repositories") load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION") +# Needed by scalafmt +SCALAPB_COMPILE_ARTIFACT_IDS = [ + "com_google_protobuf_protobuf_java", + "com_lihaoyi_fastparse", + "com_lihaoyi_sourcecode", + "scala_proto_rules_scalapb_lenses", + "scala_proto_rules_scalapb_runtime", +] + +# Needed by twitter_scrooge +GUAVA_ARTIFACT_IDS = [ + "com_google_code_findbugs_jsr305", + "com_google_errorprone_error_prone_annotations", + "com_google_j2objc_j2objc_annotations", + "io_bazel_rules_scala_guava", + "io_bazel_rules_scala_failureaccess", + "org_checkerframework_checker_qual", +] + +def scala_proto_artifact_ids(scala_version): + return ([] if scala_version.startswith("2.11.") else [ + "dev_dirs_directories", + "scala_proto_rules_scalapb_protoc_gen", + ]) + [ + "com_google_android_annotations", + "com_google_code_gson_gson", + "org_codehaus_mojo_animal_sniffer_annotations", + "scala_proto_rules_disruptor", + "scala_proto_rules_grpc_api", + "scala_proto_rules_grpc_context", + "scala_proto_rules_grpc_core", + "scala_proto_rules_grpc_netty", + "scala_proto_rules_grpc_protobuf", + "scala_proto_rules_grpc_protobuf_lite", + "scala_proto_rules_grpc_stub", + "scala_proto_rules_grpc_util", + "scala_proto_rules_instrumentation_api", + "scala_proto_rules_netty_buffer", + "scala_proto_rules_netty_codec", + "scala_proto_rules_netty_codec_http", + "scala_proto_rules_netty_codec_http2", + "scala_proto_rules_netty_codec_socks", + "scala_proto_rules_netty_common", + "scala_proto_rules_netty_handler", + "scala_proto_rules_netty_handler_proxy", + "scala_proto_rules_netty_resolver", + "scala_proto_rules_netty_transport", + "scala_proto_rules_netty_transport_native_unix_common", + "scala_proto_rules_opencensus_api", + "scala_proto_rules_opencensus_contrib_grpc_metrics", + "scala_proto_rules_opencensus_impl", + "scala_proto_rules_opencensus_impl_core", + "scala_proto_rules_perfmark_api", + "scala_proto_rules_proto_google_common_protos", + "scala_proto_rules_scalapb_compilerplugin", + "scala_proto_rules_scalapb_protoc_bridge", + "scala_proto_rules_scalapb_runtime_grpc", + ] + SCALAPB_COMPILE_ARTIFACT_IDS + GUAVA_ARTIFACT_IDS + def scala_proto_default_repositories( maven_servers = default_maven_server_urls(), scala_version = SCALA_VERSION, - overriden_artifacts = {}, - register_toolchains = True): + overriden_artifacts = {}): repositories( - for_artifact_ids = ([] if SCALA_VERSION.startswith("2.11.") else [ - "dev_dirs_directories", - "scala_proto_rules_scalapb_protoc_gen", - ]) + [ - "com_google_android_annotations", - "com_google_code_findbugs_jsr305", - "com_google_code_gson_gson", - "com_google_errorprone_error_prone_annotations", - "com_google_j2objc_j2objc_annotations", - "com_google_protobuf_protobuf_java", - "com_lihaoyi_fastparse", - "com_lihaoyi_sourcecode", - "io_bazel_rules_scala_failureaccess", - "io_bazel_rules_scala_guava", - "org_codehaus_mojo_animal_sniffer_annotations", - "org_checkerframework_checker_qual", - "scala_proto_rules_disruptor", - "scala_proto_rules_grpc_api", - "scala_proto_rules_grpc_context", - "scala_proto_rules_grpc_core", - "scala_proto_rules_grpc_netty", - "scala_proto_rules_grpc_protobuf", - "scala_proto_rules_grpc_protobuf_lite", - "scala_proto_rules_grpc_stub", - "scala_proto_rules_grpc_util", - "scala_proto_rules_instrumentation_api", - "scala_proto_rules_netty_buffer", - "scala_proto_rules_netty_codec", - "scala_proto_rules_netty_codec_http", - "scala_proto_rules_netty_codec_http2", - "scala_proto_rules_netty_codec_socks", - "scala_proto_rules_netty_common", - "scala_proto_rules_netty_handler", - "scala_proto_rules_netty_handler_proxy", - "scala_proto_rules_netty_resolver", - "scala_proto_rules_netty_transport", - "scala_proto_rules_netty_transport_native_unix_common", - "scala_proto_rules_opencensus_api", - "scala_proto_rules_opencensus_contrib_grpc_metrics", - "scala_proto_rules_opencensus_impl", - "scala_proto_rules_opencensus_impl_core", - "scala_proto_rules_perfmark_api", - "scala_proto_rules_proto_google_common_protos", - "scala_proto_rules_scalapb_compilerplugin", - "scala_proto_rules_scalapb_lenses", - "scala_proto_rules_scalapb_protoc_bridge", - "scala_proto_rules_scalapb_runtime", - "scala_proto_rules_scalapb_runtime_grpc", - ], + scala_version = scala_version, + for_artifact_ids = scala_proto_artifact_ids(scala_version), maven_servers = maven_servers, fetch_sources = True, overriden_artifacts = overriden_artifacts, ) - if register_toolchains: - native.register_toolchains( - str(Label("//scala_proto:default_deps_toolchain")), - ) + native.register_toolchains( + str(Label("//scala_proto:default_deps_toolchain")), + )