From e71531aa0afb899db07bd5d37ddb32fdde2aee13 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 12 Aug 2022 13:16:40 -0700 Subject: [PATCH] Adding new kotlin dependency --- java/kotlin/BUILD.bazel | 1 + maven_install.json | 4 ++-- protobuf_deps.bzl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/kotlin/BUILD.bazel b/java/kotlin/BUILD.bazel index 9814c7a0d3..c809117afc 100644 --- a/java/kotlin/BUILD.bazel +++ b/java/kotlin/BUILD.bazel @@ -25,6 +25,7 @@ kt_jvm_library( deps = [ ":only_for_use_in_proto_generated_code_its_generator_and_tests", "//java/lite", + "@maven//:com_google_errorprone_error_prone_annotations", ], ) diff --git a/maven_install.json b/maven_install.json index 1a938afc22..efb3f03c2a 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,10 +1,10 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 579287445, + "__INPUT_ARTIFACTS_HASH": -1875290602, "__RESOLVED_ARTIFACTS_HASH": -1248440885, "conflict_resolution": { - "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.11.0" + "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.11.0" }, "dependencies": [ { diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index d002ef3231..cd60b534d3 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -6,7 +6,7 @@ PROTOBUF_MAVEN_ARTIFACTS = [ "com.google.caliper:caliper:1.0-beta-3", "com.google.code.findbugs:jsr305:3.0.2", "com.google.code.gson:gson:2.8.9", - "com.google.errorprone:error_prone_annotations:2.3.2", + "com.google.errorprone:error_prone_annotations:2.5.1", "com.google.j2objc:j2objc-annotations:1.3", "com.google.guava:guava:31.1-jre", "com.google.guava:guava-testlib:31.1-jre",