diff --git a/WORKSPACE b/WORKSPACE index 127bd5386c..cac0d31e2a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -64,7 +64,13 @@ load("//bazel_tools:scala_version.bzl", "scala_version_configure") scala_version_configure(name = "scala_version") -load("@scala_version//:index.bzl", "scala_artifacts", "scala_major_version", "scala_major_version_suffix", "scala_version") +load( + "@scala_version//:index.bzl", + "scala_artifacts", + "scala_major_version", + "scala_major_version_suffix", + "scala_version", +) dadew(name = "dadew") @@ -718,10 +724,7 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") scala_config(scala_version) -load( - "@io_bazel_rules_scala//scala:scala.bzl", - "scala_repositories", -) +load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories") scala_repositories( fetch_sources = True, @@ -738,6 +741,26 @@ scalatest_repositories() scalatest_toolchain() +load("//bazel_tools:scalapb.bzl", "scalapb_version") + +http_archive( + name = "scalapb", + build_file_content = """ +proto_library( + name = "scalapb_proto", + srcs = ["protobuf/scalapb/scalapb.proto"], + strip_import_prefix = "protobuf/", + deps = [ + "@com_google_protobuf//:descriptor_proto", + ], + visibility = ["//visibility:public"], +) +""", + sha256 = "a5395d89ad804e2bec21ed3b61e5ccd44dc48d69a660f62244c6b15d095b5ca0", + strip_prefix = "ScalaPB-{}".format(scalapb_version), + urls = ["https://github.com/scalapb/ScalaPB/archive/refs/tags/v{}.zip".format(scalapb_version)], +) + load("@io_bazel_rules_scala//jmh:jmh.bzl", "jmh_repositories") jmh_repositories() diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl index 98daf4cbee..fdb80c60d4 100644 --- a/bazel-java-deps.bzl +++ b/bazel-java-deps.bzl @@ -7,7 +7,16 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") load("@rules_jvm_external//:specs.bzl", "maven") -load("@scala_version//:index.bzl", "scala_major_version", "scala_version") +load( + "@scala_version//:index.bzl", + "scala_major_version", + "scala_version", +) +load( + "//bazel_tools:scalapb.bzl", + "scalapb_protoc_version", + "scalapb_version", +) version_specific = { "2.12": [ @@ -120,13 +129,14 @@ def install_java_deps(): "io.netty:netty-resolver:{}".format(netty_version), "io.netty:netty-tcnative-boringssl-static:2.0.36.Final", # protobuf - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.17.1", #scalapb - "com.thesamet.scalapb:compilerplugin_{}:0.9.0".format(scala_major_version), - "com.thesamet.scalapb:lenses_{}:0.9.0".format(scala_major_version), - "com.thesamet.scalapb:protoc-bridge_{}:0.7.8".format(scala_major_version), - "com.thesamet.scalapb:scalapb-runtime_{}:0.9.0".format(scala_major_version), - "com.thesamet.scalapb:scalapb-runtime-grpc_{}:0.9.0".format(scala_major_version), + "com.thesamet.scalapb:compilerplugin_{}:{}".format(scala_major_version, scalapb_version), + "com.thesamet.scalapb:lenses_{}:{}".format(scala_major_version, scalapb_version), + "com.thesamet.scalapb:protoc-bridge_{}:{}".format(scala_major_version, scalapb_protoc_version), + "com.thesamet.scalapb:protoc-gen_{}:{}".format(scala_major_version, scalapb_protoc_version), + "com.thesamet.scalapb:scalapb-runtime_{}:{}".format(scala_major_version, scalapb_version), + "com.thesamet.scalapb:scalapb-runtime-grpc_{}:{}".format(scala_major_version, scalapb_version), # ---- end of grpc-protobuf-netty block "io.reactivex.rxjava2:rxjava:2.2.1", "io.spray:spray-json_{}:1.3.5".format(scala_major_version), diff --git a/bazel_tools/proto.bzl b/bazel_tools/proto.bzl index 2e7346bc1b..3d0a67635d 100644 --- a/bazel_tools/proto.bzl +++ b/bazel_tools/proto.bzl @@ -169,7 +169,10 @@ def _maven_tags(group, artifact_prefix, artifact_suffix): return [] def _proto_scala_srcs(name, grpc): - return [":%s" % name] + ([ + return [ + ":%s" % name, + "//bazel_tools/scalapb:scalapb-configuration", + ] + ([ "@com_github_googleapis_googleapis//google/rpc:code_proto", "@com_github_googleapis_googleapis//google/rpc:status_proto", "@com_github_grpc_grpc//src/proto/grpc/health/v1:health_proto_descriptor", diff --git a/bazel_tools/scalapb.bzl b/bazel_tools/scalapb.bzl new file mode 100644 index 0000000000..d7c0f9f2d1 --- /dev/null +++ b/bazel_tools/scalapb.bzl @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +scalapb_version = "0.11.3" +scalapb_protoc_version = "0.9.2" diff --git a/bazel_tools/scalapb/BUILD.bazel b/bazel_tools/scalapb/BUILD.bazel new file mode 100644 index 0000000000..b39a0beaef --- /dev/null +++ b/bazel_tools/scalapb/BUILD.bazel @@ -0,0 +1,16 @@ +# Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +# This configures ScalaPB to stop emitting "unknownFields" properties. +# They play havoc both with `unapply` calls, as you always need an extra `_` to ignore them, +# and also with automatically-derived Circe JSON encoders and decoders. + +load("@rules_proto//proto:defs.bzl", "proto_library") +load("@scala_version//:index.bzl", "scala_major_version_suffix") + +proto_library( + name = "scalapb-configuration", + srcs = glob(["**/*.proto"]), + visibility = ["//visibility:public"], + deps = ["@scalapb//:scalapb_proto"], +) diff --git a/bazel_tools/scalapb/com/daml/package.proto b/bazel_tools/scalapb/com/daml/package.proto new file mode 100644 index 0000000000..3c1924105d --- /dev/null +++ b/bazel_tools/scalapb/com/daml/package.proto @@ -0,0 +1,13 @@ +// Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +syntax = "proto3"; + +import "scalapb/scalapb.proto"; + +package com.daml; + +option (scalapb.options) = { + scope: PACKAGE + preserve_unknown_fields: false +}; diff --git a/ledger/ledger-api-common/src/main/scala/com/digitalasset/ledger/api/validation/LedgerOffsetValidator.scala b/ledger/ledger-api-common/src/main/scala/com/digitalasset/ledger/api/validation/LedgerOffsetValidator.scala index 56ccafb6a8..7ee757c6a1 100644 --- a/ledger/ledger-api-common/src/main/scala/com/digitalasset/ledger/api/validation/LedgerOffsetValidator.scala +++ b/ledger/ledger-api-common/src/main/scala/com/digitalasset/ledger/api/validation/LedgerOffsetValidator.scala @@ -32,12 +32,12 @@ object LedgerOffsetValidator { ledgerOffset: LedgerOffset, fieldName: String, ): Either[StatusRuntimeException, domain.LedgerOffset] = { - ledgerOffset match { - case LedgerOffset(LedgerOffset.Value.Absolute(value)) => + ledgerOffset.value match { + case LedgerOffset.Value.Absolute(value) => requireLedgerString(value, fieldName).map(domain.LedgerOffset.Absolute) - case LedgerOffset(LedgerOffset.Value.Boundary(value)) => + case LedgerOffset.Value.Boundary(value) => convertLedgerBoundary(fieldName, value) - case LedgerOffset(LedgerOffset.Value.Empty) => + case LedgerOffset.Value.Empty => Left(missingField(fieldName + ".(" + boundary + "|value)")) } } diff --git a/ledger/participant-integration-api/src/main/scala/platform/apiserver/services/tracking/TrackerImpl.scala b/ledger/participant-integration-api/src/main/scala/platform/apiserver/services/tracking/TrackerImpl.scala index ccfd66fab2..5be959693f 100644 --- a/ledger/participant-integration-api/src/main/scala/platform/apiserver/services/tracking/TrackerImpl.scala +++ b/ledger/participant-integration-api/src/main/scala/platform/apiserver/services/tracking/TrackerImpl.scala @@ -99,7 +99,7 @@ private[services] object TrackerImpl { .viaMat(tracker)(Keep.both) .toMat(Sink.foreach { case Ctx(promise, result) => result match { - case compl @ Completion(_, Some(Status(Code.OK.value, _, _)), _, _) => + case compl @ Completion(_, Some(Status(Code.OK.value, _, _, _)), _, _) => logger.trace("Completing promise with success") promise.trySuccess(compl) case Completion(_, statusO, _, _) => diff --git a/maven_install_2.12.json b/maven_install_2.12.json index 829d884893..aea0cd7e5d 100644 --- a/maven_install_2.12.json +++ b/maven_install_2.12.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -625497224, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -112514594, "conflict_resolution": {}, "dependencies": [ { @@ -1033,12 +1033,12 @@ { "coord": "com.google.protobuf:protobuf-java-util:3.12.0", "dependencies": [ - "com.google.code.gson:gson:2.8.2", - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.17.1", + "com.google.code.gson:gson:2.8.2" ], "directDependencies": [ "com.google.code.gson:gson:2.8.2", - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.17.1" ], "exclusions": [ "com.google.guava:guava", @@ -1054,12 +1054,12 @@ { "coord": "com.google.protobuf:protobuf-java-util:jar:sources:3.12.0", "dependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.code.gson:gson:jar:sources:2.8.2" ], "directDependencies": [ "com.google.code.gson:gson:jar:sources:2.8.2", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.17.1" ], "exclusions": [ "com.google.guava:guava", @@ -1073,26 +1073,26 @@ "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.12.0/protobuf-java-util-3.12.0-sources.jar" }, { - "coord": "com.google.protobuf:protobuf-java:3.14.0", + "coord": "com.google.protobuf:protobuf-java:3.17.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar" + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar" ], - "sha256": "bc9d7feab02531e15322980647379afb039fc2dccbb8f79588d1e8652efa1e00", - "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar" + "sha256": "9dcfc5c0b38326660d407375757c685dcd5883d67e06ed770bfc7966c12697dc", + "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar" }, { - "coord": "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "coord": "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar" + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar" ], - "sha256": "719cdbb11164b3659f679e0f9bec3d0238d5ca161cb9b478710dc6884e8e50c0", - "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar" + "sha256": "66c77ca0f22e5cec406330059c1a943014d2092935f51cc4f592515896b70f74", + "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar" }, { "coord": "com.h2database:h2:1.4.200", @@ -1811,224 +1811,270 @@ "url": "https://repo1.maven.org/maven2/com/storm-enroute/scalameter_2.12/0.19/scalameter_2.12-0.19-sources.jar" }, { - "coord": "com.thesamet.scalapb:compilerplugin_2.12:0.9.0", + "coord": "com.thesamet.scalapb:compilerplugin_2.12:0.11.3", + "dependencies": [ + "com.thesamet.scalapb:protoc-gen_2.12:0.9.2", + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:protoc-bridge_2.12:0.9.2", + "dev.dirs:directories:23", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2", + "org.scala-lang:scala-library:2.12.13" + ], + "directDependencies": [ + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:protoc-gen_2.12:0.9.2", + "org.scala-lang:scala-library:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3.jar" + ], + "sha256": "02287581d2e521b4f7f79aa18c0c1d4fcf8bd9bfc5d3c17c8b5ddd6391524bdd", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3.jar" + }, + { + "coord": "com.thesamet.scalapb:compilerplugin_2.12:jar:sources:0.11.3", + "dependencies": [ + "dev.dirs:directories:jar:sources:23", + "com.thesamet.scalapb:protoc-gen_2.12:jar:sources:0.9.2", + "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.9.2", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "org.scala-lang:scala-library:jar:sources:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" + ], + "directDependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "com.thesamet.scalapb:protoc-gen_2.12:jar:sources:0.9.2", + "org.scala-lang:scala-library:jar:sources:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3-sources.jar" + ], + "sha256": "a5103f4a78d5691c302a09c47425230947a1172846f72df529443b461bc9dffb", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.11.3/compilerplugin_2.12-0.11.3-sources.jar" + }, + { + "coord": "com.thesamet.scalapb:lenses_2.12:0.11.3", + "dependencies": [ + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2", + "org.scala-lang:scala-library:2.12.13" + ], + "directDependencies": [ + "org.scala-lang:scala-library:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3.jar" + ], + "sha256": "7dfe1d6d17886e6aa619de0cdd3b3892a344b2554f3c98da87f38905c3f386d2", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3.jar" + }, + { + "coord": "com.thesamet.scalapb:lenses_2.12:jar:sources:0.11.3", + "dependencies": [ + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2", + "org.scala-lang:scala-library:jar:sources:2.12.13" + ], + "directDependencies": [ + "org.scala-lang:scala-library:jar:sources:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3-sources.jar" + ], + "sha256": "9657eb68897d7bbd1552d7b0169516a6007e1aa3cf15ed037ac5fe4403c61741", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.11.3/lenses_2.12-0.11.3-sources.jar" + }, + { + "coord": "com.thesamet.scalapb:protoc-bridge_2.12:0.9.2", "dependencies": [ "org.scala-lang:scala-library:2.12.13", - "com.thesamet.scalapb:protoc-bridge_2.12:0.7.8", - "com.google.protobuf:protobuf-java:3.14.0" + "dev.dirs:directories:23" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0", - "com.thesamet.scalapb:protoc-bridge_2.12:0.7.8", + "dev.dirs:directories:23", "org.scala-lang:scala-library:2.12.13" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2.jar" ], - "sha256": "dce6277e9c618d0cee1dd5141f5bd4155eccd221588c7f1658eaa915f3eb8d33", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0.jar" + "sha256": "7eb5a3955e979867244622192ff9578cdb8ba8b84456527f537b31d0f69fabfd", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2.jar" }, { - "coord": "com.thesamet.scalapb:compilerplugin_2.12:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.9.2", "dependencies": [ - "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.7.8", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "dev.dirs:directories:jar:sources:23", "org.scala-lang:scala-library:jar:sources:2.12.13" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.7.8", + "dev.dirs:directories:jar:sources:23", "org.scala-lang:scala-library:jar:sources:2.12.13" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2-sources.jar" ], - "sha256": "caae59883dca861619ce88b6b53f4d2dac88af32ed27eaec5424c3054f3eca21", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.12/0.9.0/compilerplugin_2.12-0.9.0-sources.jar" + "sha256": "c8708746526e9f397b6559bcbff5e054ddecca5a19954de56e167889b2d0bdc4", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.9.2/protoc-bridge_2.12-0.9.2-sources.jar" }, { - "coord": "com.thesamet.scalapb:lenses_2.12:0.9.0", + "coord": "com.thesamet.scalapb:protoc-gen_2.12:0.9.2", "dependencies": [ + "org.scala-lang:scala-library:2.12.13", + "com.thesamet.scalapb:protoc-bridge_2.12:0.9.2", + "dev.dirs:directories:23" + ], + "directDependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.12:0.9.2", "org.scala-lang:scala-library:2.12.13" ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.13" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2.jar" ], - "sha256": "0a2fff4de17d270cea561618090c21d50bc891d82c6f9dfccdc20568f18d0260", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0.jar" + "sha256": "0ab2270a691891de7acd15836e6ecb42eaf266e174c9c87d871c96e00f5bfe1d", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2.jar" }, { - "coord": "com.thesamet.scalapb:lenses_2.12:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:protoc-gen_2.12:jar:sources:0.9.2", "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.13" + "dev.dirs:directories:jar:sources:23", + "org.scala-lang:scala-library:jar:sources:2.12.13", + "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.9.2" ], "directDependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.9.2", "org.scala-lang:scala-library:jar:sources:2.12.13" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2-sources.jar" ], - "sha256": "107cb837f35186db75d4a1e343fcd809591daaf08459d6d328f0ad47f4ec968e", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.12/0.9.0/lenses_2.12-0.9.0-sources.jar" + "sha256": "4de2f2bf31b79f7d48d6b7570493d679465bca98ae08ac8c90c684d18ef78147", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.12/0.9.2/protoc-gen_2.12-0.9.2-sources.jar" }, { - "coord": "com.thesamet.scalapb:protoc-bridge_2.12:0.7.8", - "dependencies": [ - "org.scala-lang:scala-library:2.12.13" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.12.13" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8.jar" - ], - "sha256": "04116b52f76adc9fac1e83e1a18321c79e332e170e6542953199e3933e5ff375", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8.jar" - }, - { - "coord": "com.thesamet.scalapb:protoc-bridge_2.12:jar:sources:0.7.8", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.13" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.12.13" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8-sources.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8-sources.jar" - ], - "sha256": "bfa5e40b1bb1e76fc8bbbf7fc2956a70483c20573f76e0380c5f66f55c526b8c", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.12/0.7.8/protoc-bridge_2.12-0.7.8-sources.jar" - }, - { - "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:0.11.3", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", - "com.thesamet.scalapb:scalapb-runtime_2.12:0.9.0", - "com.thesamet.scalapb:lenses_2.12:0.9.0", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.lihaoyi:sourcecode_2.12:0.2.1", "com.google.code.findbugs:jsr305:3.0.2", - "com.lihaoyi:fastparse_2.12:2.3.0", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", + "com.thesamet.scalapb:lenses_2.12:0.11.3", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", - "com.lihaoyi:geny_2.12:0.6.2", "io.grpc:grpc-context:1.35.0", "com.google.guava:failureaccess:1.0.1", "io.grpc:grpc-stub:1.35.0", "com.google.guava:guava:29.0-jre", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2", "com.google.api.grpc:proto-google-common-protos:2.0.1", + "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.3", "io.grpc:grpc-protobuf:1.35.0", "org.scala-lang:scala-library:2.12.13", "com.google.errorprone:error_prone_annotations:2.4.0" ], "directDependencies": [ - "com.thesamet.scalapb:scalapb-runtime_2.12:0.9.0", - "io.grpc:grpc-protobuf:1.35.0", "io.grpc:grpc-stub:1.35.0", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2", + "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.3", + "io.grpc:grpc-protobuf:1.35.0", "org.scala-lang:scala-library:2.12.13" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3.jar" ], - "sha256": "925d8d86050991da6e024138fc21a1f2ff4f8aa49c1c5f76c71b330dbaec18d1", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0.jar" + "sha256": "af3ef41af82540f6f60878a2c7e51d1f97ae25958630f8c3b52caef5223d2b7e", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3.jar" }, { - "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.12:jar:sources:0.11.3", "dependencies": [ "org.checkerframework:checker-qual:jar:sources:3.5.0", "com.google.code.findbugs:jsr305:jar:sources:3.0.2", + "com.thesamet.scalapb:lenses_2.12:jar:sources:0.11.3", "io.grpc:grpc-context:jar:sources:1.35.0", "io.grpc:grpc-stub:jar:sources:1.35.0", "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", "io.grpc:grpc-protobuf:jar:sources:1.35.0", - "com.lihaoyi:sourcecode_2.12:jar:sources:0.2.1", - "com.thesamet.scalapb:lenses_2.12:jar:sources:0.9.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", - "com.lihaoyi:geny_2.12:jar:sources:0.6.2", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "org.scala-lang:scala-library:jar:sources:2.12.13", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", - "com.lihaoyi:fastparse_2.12:jar:sources:2.3.0", "com.google.guava:failureaccess:jar:sources:1.0.1", + "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.11.3", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.19", - "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.9.0" + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" ], "directDependencies": [ - "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.9.0", - "io.grpc:grpc-protobuf:jar:sources:1.35.0", "io.grpc:grpc-stub:jar:sources:1.35.0", - "org.scala-lang:scala-library:jar:sources:2.12.13" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0-sources.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0-sources.jar" - ], - "sha256": "2aeb221edcd64b059587ba8462ff45ca3e45e46f35465bc6015c0f8b1d3b9cb0", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.9.0/scalapb-runtime-grpc_2.12-0.9.0-sources.jar" - }, - { - "coord": "com.thesamet.scalapb:scalapb-runtime_2.12:0.9.0", - "dependencies": [ - "com.thesamet.scalapb:lenses_2.12:0.9.0", - "com.lihaoyi:sourcecode_2.12:0.2.1", - "com.lihaoyi:fastparse_2.12:2.3.0", - "com.google.protobuf:protobuf-java:3.14.0", - "com.lihaoyi:geny_2.12:0.6.2", - "org.scala-lang:scala-library:2.12.13" - ], - "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0", - "com.lihaoyi:fastparse_2.12:2.3.0", - "com.thesamet.scalapb:lenses_2.12:0.9.0", - "org.scala-lang:scala-library:2.12.13" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0.jar" - ], - "sha256": "b905fa66b3fd0fabf3114105cd73ae2bdddbb6e13188a6538a92ae695e7ad6ed", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0.jar" - }, - { - "coord": "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.9.0", - "dependencies": [ - "com.lihaoyi:sourcecode_2.12:jar:sources:0.2.1", - "com.thesamet.scalapb:lenses_2.12:jar:sources:0.9.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "com.lihaoyi:geny_2.12:jar:sources:0.6.2", + "io.grpc:grpc-protobuf:jar:sources:1.35.0", "org.scala-lang:scala-library:jar:sources:2.12.13", - "com.lihaoyi:fastparse_2.12:jar:sources:2.3.0" + "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.11.3", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3-sources.jar" + ], + "sha256": "78865685c1b326f558b1892bcc4d2cbe5462a53c31a2091e755ea451966f90b1", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.12/0.11.3/scalapb-runtime-grpc_2.12-0.11.3-sources.jar" + }, + { + "coord": "com.thesamet.scalapb:scalapb-runtime_2.12:0.11.3", + "dependencies": [ + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2", + "org.scala-lang:scala-library:2.12.13", + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:lenses_2.12:0.11.3" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "com.lihaoyi:fastparse_2.12:jar:sources:2.3.0", - "com.thesamet.scalapb:lenses_2.12:jar:sources:0.9.0", - "org.scala-lang:scala-library:jar:sources:2.12.13" + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:lenses_2.12:0.11.3", + "org.scala-lang:scala-library:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:2.3.2" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3.jar" ], - "sha256": "2e1c8072c7b536e3599afabe6c60cd29ac3918640436c177224b3102e7ba007b", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.9.0/scalapb-runtime_2.12-0.9.0-sources.jar" + "sha256": "61f9c512a53d4233fbdeece058fd4101b9314f7810967673ca91607cd4c5cb15", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3.jar" + }, + { + "coord": "com.thesamet.scalapb:scalapb-runtime_2.12:jar:sources:0.11.3", + "dependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2", + "org.scala-lang:scala-library:jar:sources:2.12.13", + "com.thesamet.scalapb:lenses_2.12:jar:sources:0.11.3" + ], + "directDependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "com.thesamet.scalapb:lenses_2.12:jar:sources:0.11.3", + "org.scala-lang:scala-library:jar:sources:2.12.13", + "org.scala-lang.modules:scala-collection-compat_2.12:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3-sources.jar" + ], + "sha256": "704bc058c0f3af7e271257d545fc7c62947858457c20edd7fe4121e7984e2f49", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.12/0.11.3/scalapb-runtime_2.12-0.11.3-sources.jar" }, { "coord": "com.thoughtworks.paranamer:paranamer:2.8", @@ -2788,6 +2834,28 @@ "sha256": "5024a2b980df7bec5f837177775ebf0e5bec25374deaca65f02571fe65ed52f5", "url": "https://repo1.maven.org/maven2/commons-net/commons-net/3.6/commons-net-3.6-sources.jar" }, + { + "coord": "dev.dirs:directories:23", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar" + ], + "sha256": "4c624b1731efe4a053f6e6cbb67b4c8ae2eaf8d0ae4fa164067b1a36b9259ba7", + "url": "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar" + }, + { + "coord": "dev.dirs:directories:jar:sources:23", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar" + ], + "sha256": "dddc21258f68285899a2fb620ecb46a989ee68418043dd094dca70b24c006f8e", + "url": "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar" + }, { "coord": "eu.rekawek.toxiproxy:toxiproxy-java:2.1.3", "dependencies": [ @@ -3514,11 +3582,11 @@ "coord": "io.grpc:grpc-protobuf:1.35.0", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", "com.google.code.findbugs:jsr305:3.0.2", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", "io.grpc:grpc-context:1.35.0", @@ -3528,10 +3596,10 @@ "com.google.errorprone:error_prone_annotations:2.4.0" ], "directDependencies": [ + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.code.findbugs:jsr305:3.0.2", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "io.grpc:grpc-api:1.35.0", "com.google.guava:guava:29.0-jre", "com.google.api.grpc:proto-google-common-protos:2.0.1", @@ -3552,9 +3620,9 @@ "io.grpc:grpc-context:jar:sources:1.35.0", "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", @@ -3564,9 +3632,9 @@ "directDependencies": [ "com.google.code.findbugs:jsr305:jar:sources:3.0.2", "com.google.guava:guava:jar:sources:29.0-jre", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.19" @@ -3582,13 +3650,13 @@ "coord": "io.grpc:grpc-services:1.35.0", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", "com.google.code.findbugs:jsr305:3.0.2", "io.grpc:grpc-core:1.35.0", "com.google.android:annotations:4.1.1.4", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "io.perfmark:perfmark-api:0.23.0", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", @@ -3630,11 +3698,11 @@ "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", "io.grpc:grpc-protobuf:jar:sources:1.35.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-core:jar:sources:1.35.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "com.google.code.gson:gson:jar:sources:2.8.2", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", diff --git a/maven_install_2.13.json b/maven_install_2.13.json index d5f329ba3f..f269ba6bf6 100644 --- a/maven_install_2.13.json +++ b/maven_install_2.13.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1223348383, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -367049757, "conflict_resolution": {}, "dependencies": [ { @@ -1079,12 +1079,12 @@ { "coord": "com.google.protobuf:protobuf-java-util:3.12.0", "dependencies": [ - "com.google.code.gson:gson:2.8.2", - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.17.1", + "com.google.code.gson:gson:2.8.2" ], "directDependencies": [ "com.google.code.gson:gson:2.8.2", - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.17.1" ], "exclusions": [ "com.google.guava:guava", @@ -1100,12 +1100,12 @@ { "coord": "com.google.protobuf:protobuf-java-util:jar:sources:3.12.0", "dependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.code.gson:gson:jar:sources:2.8.2" ], "directDependencies": [ "com.google.code.gson:gson:jar:sources:2.8.2", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.17.1" ], "exclusions": [ "com.google.guava:guava", @@ -1119,26 +1119,26 @@ "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.12.0/protobuf-java-util-3.12.0-sources.jar" }, { - "coord": "com.google.protobuf:protobuf-java:3.14.0", + "coord": "com.google.protobuf:protobuf-java:3.17.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar" + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar" ], - "sha256": "bc9d7feab02531e15322980647379afb039fc2dccbb8f79588d1e8652efa1e00", - "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar" + "sha256": "9dcfc5c0b38326660d407375757c685dcd5883d67e06ed770bfc7966c12697dc", + "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1.jar" }, { - "coord": "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "coord": "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar" + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar" ], - "sha256": "719cdbb11164b3659f679e0f9bec3d0238d5ca161cb9b478710dc6884e8e50c0", - "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar" + "sha256": "66c77ca0f22e5cec406330059c1a943014d2092935f51cc4f592515896b70f74", + "url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.17.1/protobuf-java-3.17.1-sources.jar" }, { "coord": "com.h2database:h2:1.4.200", @@ -1895,224 +1895,270 @@ "url": "https://repo1.maven.org/maven2/com/tdunning/t-digest/3.1/t-digest-3.1-sources.jar" }, { - "coord": "com.thesamet.scalapb:compilerplugin_2.13:0.9.0", + "coord": "com.thesamet.scalapb:compilerplugin_2.13:0.11.3", + "dependencies": [ + "com.thesamet.scalapb:protoc-gen_2.13:0.9.2", + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:protoc-bridge_2.13:0.9.2", + "org.scala-lang:scala-library:2.13.5", + "dev.dirs:directories:23", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2" + ], + "directDependencies": [ + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:protoc-gen_2.13:0.9.2", + "org.scala-lang:scala-library:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3.jar" + ], + "sha256": "fc5b5b39f8b0ea8fc2547be741943355be2e2d5bbc6f9700029445cf3ad04bcc", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3.jar" + }, + { + "coord": "com.thesamet.scalapb:compilerplugin_2.13:jar:sources:0.11.3", + "dependencies": [ + "dev.dirs:directories:jar:sources:23", + "com.thesamet.scalapb:protoc-gen_2.13:jar:sources:0.9.2", + "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.9.2" + ], + "directDependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "com.thesamet.scalapb:protoc-gen_2.13:jar:sources:0.9.2", + "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3-sources.jar" + ], + "sha256": "a5103f4a78d5691c302a09c47425230947a1172846f72df529443b461bc9dffb", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.11.3/compilerplugin_2.13-0.11.3-sources.jar" + }, + { + "coord": "com.thesamet.scalapb:lenses_2.13:0.11.3", + "dependencies": [ + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2", + "org.scala-lang:scala-library:2.13.5" + ], + "directDependencies": [ + "org.scala-lang:scala-library:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3.jar" + ], + "sha256": "8e0f52f94eaa92d9799fa3f2b2c84fa837b3d7cea468c769fc8cdf00c9ee60ac", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3.jar" + }, + { + "coord": "com.thesamet.scalapb:lenses_2.13:jar:sources:0.11.3", + "dependencies": [ + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", + "org.scala-lang:scala-library:jar:sources:2.13.5" + ], + "directDependencies": [ + "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2" + ], + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3-sources.jar" + ], + "sha256": "77d714d8c41431933a3e16d7e610b2dff53bbe41037186ad0b855ea6af6b9280", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.11.3/lenses_2.13-0.11.3-sources.jar" + }, + { + "coord": "com.thesamet.scalapb:protoc-bridge_2.13:0.9.2", "dependencies": [ "org.scala-lang:scala-library:2.13.5", - "com.thesamet.scalapb:protoc-bridge_2.13:0.7.8", - "com.google.protobuf:protobuf-java:3.14.0" + "dev.dirs:directories:23" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0", - "com.thesamet.scalapb:protoc-bridge_2.13:0.7.8", + "dev.dirs:directories:23", "org.scala-lang:scala-library:2.13.5" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2.jar" ], - "sha256": "c31f646cc08e39d9da600f89be822e438d01192513ab1689e203811193913ebe", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0.jar" + "sha256": "15471021ab5343844a5c9d1ca86f6c8824982843e9e186ad2fc398fe1a33573e", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2.jar" }, { - "coord": "com.thesamet.scalapb:compilerplugin_2.13:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.9.2", "dependencies": [ - "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.7.8", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "dev.dirs:directories:jar:sources:23", "org.scala-lang:scala-library:jar:sources:2.13.5" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.7.8", + "dev.dirs:directories:jar:sources:23", "org.scala-lang:scala-library:jar:sources:2.13.5" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2-sources.jar" ], - "sha256": "367dd85d9bf22f9c485b1c1a97a91c2d6c06647838ffdf54b8977761f8d2946c", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/compilerplugin_2.13/0.9.0/compilerplugin_2.13-0.9.0-sources.jar" + "sha256": "c8708746526e9f397b6559bcbff5e054ddecca5a19954de56e167889b2d0bdc4", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.9.2/protoc-bridge_2.13-0.9.2-sources.jar" }, { - "coord": "com.thesamet.scalapb:lenses_2.13:0.9.0", + "coord": "com.thesamet.scalapb:protoc-gen_2.13:0.9.2", "dependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.13:0.9.2", + "org.scala-lang:scala-library:2.13.5", + "dev.dirs:directories:23" + ], + "directDependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.13:0.9.2", "org.scala-lang:scala-library:2.13.5" ], - "directDependencies": [ - "org.scala-lang:scala-library:2.13.5" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2.jar" ], - "sha256": "dfb37387327cc0e262b93a5c3b33638359b4e6d76f59d8070a39c319f7b62ba3", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0.jar" + "sha256": "727e0003e163e593bef0fed7844f3a572ec84c89b4bd2a9ffe645aef417e18f3", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2.jar" }, { - "coord": "com.thesamet.scalapb:lenses_2.13:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:protoc-gen_2.13:jar:sources:0.9.2", "dependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.9.2", + "dev.dirs:directories:jar:sources:23", "org.scala-lang:scala-library:jar:sources:2.13.5" ], "directDependencies": [ + "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.9.2", "org.scala-lang:scala-library:jar:sources:2.13.5" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2-sources.jar" ], - "sha256": "a064d04ad5880793df61418b31d01a37eeb7693d95cd5056ba75ada61243c712", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/lenses_2.13/0.9.0/lenses_2.13-0.9.0-sources.jar" + "sha256": "4de2f2bf31b79f7d48d6b7570493d679465bca98ae08ac8c90c684d18ef78147", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-gen_2.13/0.9.2/protoc-gen_2.13-0.9.2-sources.jar" }, { - "coord": "com.thesamet.scalapb:protoc-bridge_2.13:0.7.8", - "dependencies": [ - "org.scala-lang:scala-library:2.13.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:2.13.5" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8.jar" - ], - "sha256": "9cb94f540687ce4118f6cf51f29cdb03fed62893255d177a9d3e4090a882b75a", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8.jar" - }, - { - "coord": "com.thesamet.scalapb:protoc-bridge_2.13:jar:sources:0.7.8", - "dependencies": [ - "org.scala-lang:scala-library:jar:sources:2.13.5" - ], - "directDependencies": [ - "org.scala-lang:scala-library:jar:sources:2.13.5" - ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8-sources.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8-sources.jar" - ], - "sha256": "994e54df09768233f850559307f17f30ebe7822c27ff20ba9009a0929709df83", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/protoc-bridge_2.13/0.7.8/protoc-bridge_2.13-0.7.8-sources.jar" - }, - { - "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:0.11.3", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.thesamet.scalapb:lenses_2.13:0.9.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.lihaoyi:sourcecode_2.13:0.2.1", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", - "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.0", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", "org.scala-lang:scala-library:2.13.5", - "com.lihaoyi:fastparse_2.13:2.3.0", "io.grpc:grpc-context:1.35.0", + "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.3", "com.google.guava:failureaccess:1.0.1", "io.grpc:grpc-stub:1.35.0", + "com.thesamet.scalapb:lenses_2.13:0.11.3", "com.google.guava:guava:29.0-jre", "com.google.api.grpc:proto-google-common-protos:2.0.1", "io.grpc:grpc-protobuf:1.35.0", - "com.lihaoyi:geny_2.13:0.6.2", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2", "com.google.errorprone:error_prone_annotations:2.4.0" ], "directDependencies": [ - "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.0", - "io.grpc:grpc-protobuf:1.35.0", + "org.scala-lang:scala-library:2.13.5", + "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.3", "io.grpc:grpc-stub:1.35.0", - "org.scala-lang:scala-library:2.13.5" + "io.grpc:grpc-protobuf:1.35.0", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3.jar" ], - "sha256": "b7a423020ee9f150b546883c20413ca950530d2811b934debd2c8f3487e68f50", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0.jar" + "sha256": "b51b68ba840106de317b8488c1feee1a2e00b7586cea15d0a58c87e5914901bc", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3.jar" }, { - "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime-grpc_2.13:jar:sources:0.11.3", "dependencies": [ - "com.lihaoyi:fastparse_2.13:jar:sources:2.3.0", "org.checkerframework:checker-qual:jar:sources:3.5.0", "com.google.code.findbugs:jsr305:jar:sources:3.0.2", "io.grpc:grpc-context:jar:sources:1.35.0", - "com.thesamet.scalapb:lenses_2.13:jar:sources:0.9.0", "io.grpc:grpc-stub:jar:sources:1.35.0", "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", "io.grpc:grpc-protobuf:jar:sources:1.35.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1", + "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.11.3", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", - "com.lihaoyi:geny_2.13:jar:sources:0.6.2", "com.google.guava:failureaccess:jar:sources:1.0.1", - "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.19", - "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.9.0" + "com.thesamet.scalapb:lenses_2.13:jar:sources:0.11.3", + "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.19" ], "directDependencies": [ - "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.9.0", - "io.grpc:grpc-protobuf:jar:sources:1.35.0", "io.grpc:grpc-stub:jar:sources:1.35.0", - "org.scala-lang:scala-library:jar:sources:2.13.5" + "io.grpc:grpc-protobuf:jar:sources:1.35.0", + "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", + "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.11.3" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0-sources.jar" + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3-sources.jar" ], - "sha256": "57fafb5ed9de7a031e9100ff6b5ffcb9a80a8c6acf331e47bf249f07e69f8b19", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.9.0/scalapb-runtime-grpc_2.13-0.9.0-sources.jar" + "sha256": "78865685c1b326f558b1892bcc4d2cbe5462a53c31a2091e755ea451966f90b1", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime-grpc_2.13/0.11.3/scalapb-runtime-grpc_2.13-0.11.3-sources.jar" }, { - "coord": "com.thesamet.scalapb:scalapb-runtime_2.13:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.3", "dependencies": [ - "com.thesamet.scalapb:lenses_2.13:0.9.0", - "com.lihaoyi:sourcecode_2.13:0.2.1", - "com.google.protobuf:protobuf-java:3.14.0", - "org.scala-lang:scala-library:2.13.5", - "com.lihaoyi:fastparse_2.13:2.3.0", - "com.lihaoyi:geny_2.13:0.6.2" - ], - "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0", - "com.lihaoyi:fastparse_2.13:2.3.0", - "com.thesamet.scalapb:lenses_2.13:0.9.0", + "com.thesamet.scalapb:lenses_2.13:0.11.3", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2", + "com.google.protobuf:protobuf-java:3.17.1", "org.scala-lang:scala-library:2.13.5" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0.jar" + "directDependencies": [ + "com.google.protobuf:protobuf-java:3.17.1", + "com.thesamet.scalapb:lenses_2.13:0.11.3", + "org.scala-lang:scala-library:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:2.3.2" ], - "sha256": "10830d6511fc21b997c4acdde6f6700e87ee6791cbe6278f5acd7b352670a88f", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0.jar" + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3.jar" + ], + "sha256": "10a4cd85d9f7eb5eca646f198da35bbd87639fbb55ef44a2fe272d40123e1f5b", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3.jar" }, { - "coord": "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.9.0", + "coord": "com.thesamet.scalapb:scalapb-runtime_2.13:jar:sources:0.11.3", "dependencies": [ - "com.lihaoyi:fastparse_2.13:jar:sources:2.3.0", - "com.thesamet.scalapb:lenses_2.13:jar:sources:0.9.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "org.scala-lang:scala-library:jar:sources:2.13.5", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1", - "com.lihaoyi:geny_2.13:jar:sources:0.6.2" - ], - "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", - "com.lihaoyi:fastparse_2.13:jar:sources:2.3.0", - "com.thesamet.scalapb:lenses_2.13:jar:sources:0.9.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", + "com.thesamet.scalapb:lenses_2.13:jar:sources:0.11.3", "org.scala-lang:scala-library:jar:sources:2.13.5" ], - "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0-sources.jar", - "mirror_urls": [ - "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0-sources.jar" + "directDependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", + "com.thesamet.scalapb:lenses_2.13:jar:sources:0.11.3", + "org.scala-lang:scala-library:jar:sources:2.13.5", + "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2" ], - "sha256": "31f52364ac4892cb8af82e71f171c92aa1d63d8379a8856bd42b5af2046f8a51", - "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.9.0/scalapb-runtime_2.13-0.9.0-sources.jar" + "file": "v1/https/repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3-sources.jar" + ], + "sha256": "fe285f803bc37893a3f94865bf193b39928a062a42e14de5f57c68b9515501c9", + "url": "https://repo1.maven.org/maven2/com/thesamet/scalapb/scalapb-runtime_2.13/0.11.3/scalapb-runtime_2.13-0.11.3-sources.jar" }, { "coord": "com.thoughtworks.paranamer:paranamer:2.8", @@ -2872,6 +2918,28 @@ "sha256": "5024a2b980df7bec5f837177775ebf0e5bec25374deaca65f02571fe65ed52f5", "url": "https://repo1.maven.org/maven2/commons-net/commons-net/3.6/commons-net-3.6-sources.jar" }, + { + "coord": "dev.dirs:directories:23", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar" + ], + "sha256": "4c624b1731efe4a053f6e6cbb67b4c8ae2eaf8d0ae4fa164067b1a36b9259ba7", + "url": "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23.jar" + }, + { + "coord": "dev.dirs:directories:jar:sources:23", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar", + "mirror_urls": [ + "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar" + ], + "sha256": "dddc21258f68285899a2fb620ecb46a989ee68418043dd094dca70b24c006f8e", + "url": "https://repo1.maven.org/maven2/dev/dirs/directories/23/directories-23-sources.jar" + }, { "coord": "eu.rekawek.toxiproxy:toxiproxy-java:2.1.3", "dependencies": [ @@ -5412,11 +5480,11 @@ "coord": "io.grpc:grpc-protobuf:1.35.0", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", "com.google.code.findbugs:jsr305:3.0.2", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", "io.grpc:grpc-context:1.35.0", @@ -5426,10 +5494,10 @@ "com.google.errorprone:error_prone_annotations:2.4.0" ], "directDependencies": [ + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.code.findbugs:jsr305:3.0.2", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "io.grpc:grpc-api:1.35.0", "com.google.guava:guava:29.0-jre", "com.google.api.grpc:proto-google-common-protos:2.0.1", @@ -5450,9 +5518,9 @@ "io.grpc:grpc-context:jar:sources:1.35.0", "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", @@ -5462,9 +5530,9 @@ "directDependencies": [ "com.google.code.findbugs:jsr305:jar:sources:3.0.2", "com.google.guava:guava:jar:sources:29.0-jre", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.19" @@ -5480,13 +5548,13 @@ "coord": "io.grpc:grpc-services:1.35.0", "dependencies": [ "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", + "com.google.protobuf:protobuf-java:3.17.1", "io.grpc:grpc-protobuf-lite:1.35.0", "com.google.j2objc:j2objc-annotations:1.3", "com.google.code.findbugs:jsr305:3.0.2", "io.grpc:grpc-core:1.35.0", "com.google.android:annotations:4.1.1.4", "org.codehaus.mojo:animal-sniffer-annotations:1.19", - "com.google.protobuf:protobuf-java:3.14.0", "io.perfmark:perfmark-api:0.23.0", "org.checkerframework:checker-qual:3.5.0", "io.grpc:grpc-api:1.35.0", @@ -5528,11 +5596,11 @@ "com.google.j2objc:j2objc-annotations:jar:sources:1.3", "com.google.guava:guava:jar:sources:29.0-jre", "io.grpc:grpc-protobuf:jar:sources:1.35.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.grpc:grpc-core:jar:sources:1.35.0", "io.grpc:grpc-protobuf-lite:jar:sources:1.35.0", "com.google.code.gson:gson:jar:sources:2.8.2", "io.grpc:grpc-api:jar:sources:1.35.0", + "com.google.protobuf:protobuf-java:jar:sources:3.17.1", "com.google.errorprone:error_prone_annotations:jar:sources:2.4.0", "com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava", "com.google.api.grpc:proto-google-common-protos:jar:sources:2.0.1", diff --git a/scala-protoc-plugins/scala-akka/AkkaGrpcServicePrinter.scala b/scala-protoc-plugins/scala-akka/AkkaGrpcServicePrinter.scala index 9a2025a7e1..f59181090d 100644 --- a/scala-protoc-plugins/scala-akka/AkkaGrpcServicePrinter.scala +++ b/scala-protoc-plugins/scala-akka/AkkaGrpcServicePrinter.scala @@ -5,15 +5,19 @@ package com.daml.protoc.plugins.akka import com.google.protobuf.Descriptors.{MethodDescriptor, ServiceDescriptor} import scalapb.compiler.FunctionalPrinter.PrinterEndo -import scalapb.compiler._ +import scalapb.compiler.{DescriptorImplicits, FunctionalPrinter, StreamType} -final class AkkaGrpcServicePrinter(service: ServiceDescriptor, params: GeneratorParams) - extends DescriptorImplicits(params, Seq(service.getFile)) { - private[this] val killSwitchName = s""""${service.getName}KillSwitch ${System.nanoTime()}"""" +final class AkkaGrpcServicePrinter( + service: ServiceDescriptor +)(implicit descriptorImplicits: DescriptorImplicits) { + import descriptorImplicits._ - private[this] def observer(typeParam: String): String = s"$streamObserver[$typeParam]" + private val streamObserver = "_root_.io.grpc.stub.StreamObserver" + private val killSwitchName = s""""${service.getName}KillSwitch ${System.nanoTime()}"""" - private[this] def serviceMethodSignature(method: MethodDescriptor): PrinterEndo = { p => + private def observer(typeParam: String): String = s"$streamObserver[$typeParam]" + + private def serviceMethodSignature(method: MethodDescriptor): PrinterEndo = { p => method.streamType match { case StreamType.Unary => p case StreamType.ClientStreaming => p @@ -49,7 +53,7 @@ final class AkkaGrpcServicePrinter(service: ServiceDescriptor, params: Generator } } - private[this] def traitBody: PrinterEndo = { + private def traitBody: PrinterEndo = { val endos: PrinterEndo = { p => p.call(service.methods.map(m => serviceMethodSignature(m)): _*) } @@ -75,7 +79,6 @@ final class AkkaGrpcServicePrinter(service: ServiceDescriptor, params: Generator .outdent .add("}") } - private[this] val streamObserver = "_root_.io.grpc.stub.StreamObserver" def printService(printer: FunctionalPrinter): Option[FunctionalPrinter] = { @@ -84,7 +87,7 @@ final class AkkaGrpcServicePrinter(service: ServiceDescriptor, params: Generator if (hasStreamingEndpoint) Some { printer .add( - "package " + service.getFile.scalaPackageName, + "package " + service.getFile.scalaPackage.fullName, "", s"trait ${service.name}AkkaGrpc extends ${service.getName}Grpc.${service.getName} with AutoCloseable {", ) diff --git a/scala-protoc-plugins/scala-akka/AkkaStreamCompilerPlugin.scala b/scala-protoc-plugins/scala-akka/AkkaStreamCompilerPlugin.scala new file mode 100644 index 0000000000..65886a8a67 --- /dev/null +++ b/scala-protoc-plugins/scala-akka/AkkaStreamCompilerPlugin.scala @@ -0,0 +1,25 @@ +// Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +package com.daml.protoc.plugins.akka + +import com.google.protobuf.ExtensionRegistry +import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest +import protocgen.CodeGenRequest +import scalapb.options.Scalapb + +import scala.reflect.io.Streamable + +object AkkaStreamCompilerPlugin { + def main(args: Array[String]): Unit = { + val registry = ExtensionRegistry.newInstance() + Scalapb.registerAllExtensions(registry) + val request = CodeGeneratorRequest.parseFrom(Streamable.bytes(System.in), registry) + System.out.write( + AkkaStreamGenerator + .handleCodeGeneratorRequest(CodeGenRequest(request)) + .toCodeGeneratorResponse + .toByteArray + ) + } +} diff --git a/scala-protoc-plugins/scala-akka/AkkaStreamGenerator.scala b/scala-protoc-plugins/scala-akka/AkkaStreamGenerator.scala index 2334399d1e..82cd8e4d7b 100644 --- a/scala-protoc-plugins/scala-akka/AkkaStreamGenerator.scala +++ b/scala-protoc-plugins/scala-akka/AkkaStreamGenerator.scala @@ -6,47 +6,43 @@ import com.google.protobuf.Descriptors._ import com.google.protobuf.ExtensionRegistry import com.google.protobuf.compiler.PluginProtos.{CodeGeneratorRequest, CodeGeneratorResponse} import protocbridge.ProtocCodeGenerator +import protocgen.{CodeGenRequest, CodeGenResponse} import scalapb.compiler._ -import scalapb.options.compiler.Scalapb +import scalapb.options.Scalapb import scala.jdk.CollectionConverters._ -import scala.reflect.io.Streamable // This file is mostly copied over from ScalaPbCodeGenerator and ProtobufGenerator -object AkkaStreamCompilerPlugin { - def main(args: Array[String]): Unit = { - val registry = ExtensionRegistry.newInstance() - Scalapb.registerAllExtensions(registry) - val request = CodeGeneratorRequest.parseFrom(Streamable.bytes(System.in), registry) - System.out.write(AkkaStreamGenerator.handleCodeGeneratorRequest(request).toByteArray) - } -} - -class AkkaStreamGenerator(val params: GeneratorParams, files: Seq[FileDescriptor]) - extends DescriptorImplicits(params, files) { - def generateServiceFiles(file: FileDescriptor): collection.Seq[CodeGeneratorResponse.File] = { - file.getServices.asScala.flatMap { service => - val p = new AkkaGrpcServicePrinter(service, params) - p.printService(FunctionalPrinter()).fold[List[CodeGeneratorResponse.File]](Nil) { p => - val code = p.result() - val b = CodeGeneratorResponse.File.newBuilder() - b.setName(file.scalaDirectory + "/" + service.name + "AkkaGrpc.scala") - b.setContent(code) - List(b.build) - } - } - } -} - object AkkaStreamGenerator extends ProtocCodeGenerator { override def run(req: Array[Byte]): Array[Byte] = { val registry = ExtensionRegistry.newInstance() Scalapb.registerAllExtensions(registry) val request = CodeGeneratorRequest.parseFrom(req, registry) - handleCodeGeneratorRequest(request).toByteArray + handleCodeGeneratorRequest(CodeGenRequest(request)).toCodeGeneratorResponse.toByteArray } - def parseParameters(params: String): Either[String, GeneratorParams] = { + + def handleCodeGeneratorRequest(request: CodeGenRequest): CodeGenResponse = + parseParameters(request.parameter) match { + case Right(params) => + implicit val descriptorImplicits: DescriptorImplicits = + DescriptorImplicits.fromCodeGenRequest(params, request) + try { + val filesByName: Map[String, FileDescriptor] = + request.allProtos.map(fd => fd.getName -> fd).toMap + val validator = new ProtoValidation(descriptorImplicits) + filesByName.values.foreach(validator.validateFile) + val responseFiles = request.filesToGenerate.flatMap(generateServiceFiles(_)) + CodeGenResponse.succeed(responseFiles) + } catch { + case exception: GeneratorException => + CodeGenResponse.fail(exception.message) + } + case Left(error) => + CodeGenResponse.fail(error) + } + + private def parseParameters(params: String): Either[String, GeneratorParams] = { params .split(",") .map(_.trim) @@ -64,33 +60,22 @@ object AkkaStreamGenerator extends ProtocCodeGenerator { } } - def handleCodeGeneratorRequest(request: CodeGeneratorRequest): CodeGeneratorResponse = { - val b = CodeGeneratorResponse.newBuilder - parseParameters(request.getParameter) match { - case Right(params) => - try { - val filesByName: Map[String, FileDescriptor] = - request.getProtoFileList.asScala.foldLeft[Map[String, FileDescriptor]](Map.empty) { - case (acc, fp) => - val deps = fp.getDependencyList.asScala.map(acc) - acc + (fp.getName -> FileDescriptor.buildFrom(fp, deps.toArray)) - } - val generator = new AkkaStreamGenerator(params, filesByName.values.toSeq) - val validator = new ProtoValidation(generator) - filesByName.values.foreach(validator.validateFile) - request.getFileToGenerateList.asScala.foreach { name => - val file = filesByName(name) - val responseFiles = generator.generateServiceFiles(file) - b.addAllFile(responseFiles.asJava) - } - } catch { - case e: GeneratorException => - b.setError(e.message) - } - case Left(error) => - b.setError(error) + private def generateServiceFiles( + file: FileDescriptor + )(implicit + descriptorImplicits: DescriptorImplicits + ): collection.Seq[CodeGeneratorResponse.File] = { + import descriptorImplicits._ + file.getServices.asScala.flatMap { service => + val printer = new AkkaGrpcServicePrinter(service) + printer.printService(FunctionalPrinter()).fold[List[CodeGeneratorResponse.File]](Nil) { p => + val code = p.result() + val fileBuilder = CodeGeneratorResponse.File.newBuilder() + fileBuilder.setName(file.scalaDirectory + "/" + service.name + "AkkaGrpc.scala") + fileBuilder.setContent(code) + List(fileBuilder.build()) + } } - b.build } val deprecatedAnnotation: String = diff --git a/scala-protoc-plugins/scala-akka/BUILD.bazel b/scala-protoc-plugins/scala-akka/BUILD.bazel index d27fb34cda..1828e0d1cd 100644 --- a/scala-protoc-plugins/scala-akka/BUILD.bazel +++ b/scala-protoc-plugins/scala-akka/BUILD.bazel @@ -10,6 +10,7 @@ da_scala_binary( scala_deps = [ "@maven//:com_thesamet_scalapb_compilerplugin", "@maven//:com_thesamet_scalapb_protoc_bridge", + "@maven//:com_thesamet_scalapb_protoc_gen", ], versioned_scala_deps = { "2.12": ["@maven//:org_scala_lang_modules_scala_collection_compat"], diff --git a/scala-protoc-plugins/scalapb/BUILD.bazel b/scala-protoc-plugins/scalapb/BUILD.bazel index 691765f487..faab76920f 100644 --- a/scala-protoc-plugins/scalapb/BUILD.bazel +++ b/scala-protoc-plugins/scalapb/BUILD.bazel @@ -10,6 +10,7 @@ da_scala_binary( scala_deps = [ "@maven//:com_thesamet_scalapb_compilerplugin", "@maven//:com_thesamet_scalapb_protoc_bridge", + "@maven//:com_thesamet_scalapb_protoc_gen", ], visibility = ["//visibility:public"], deps = [