diff --git a/MODULE.bazel b/MODULE.bazel index 7f5f80f..34b78f7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -11,8 +11,12 @@ bazel_dep(name = "rules_kotlin", version = "2.2.2") bazel_dep(name = "rules_python", version = "1.7.0") bazel_dep(name = "bazel_skylib", version = "1.9.0") bazel_dep(name = "platforms", version = "1.0.0") -bazel_dep(name = "bazel_worker_api", version = "0.0.10") -bazel_dep(name = "bazel_worker_java", version = "0.0.10") +bazel_dep(name = "bazel_worker_api", version = "0.0.11") +bazel_dep(name = "bazel_worker_java", version = "0.0.11") + +# Keep in sync with the protobuf version bazel_worker_java depends on. The worker +# sources protobuf-java from this module rather than via rules_jvm_external. +bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") bazel_dep(name = "aspect_bazel_lib", version = "2.22.5", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.2", dev_dependency = True) @@ -34,9 +38,6 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( name = "rules_android_lint_deps", artifacts = [ - # Worker Dependencies - "com.google.protobuf:protobuf-java:4.29.0", - "com.google.protobuf:protobuf-java-util:4.29.0", # Args Parsing "com.xenomachina:kotlin-argparser:2.0.7", # Lint Dependencies diff --git a/maven_install.json b/maven_install.json index 24116be..4255a60 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 337570525, - "__RESOLVED_ARTIFACTS_HASH": 252373774, + "__INPUT_ARTIFACTS_HASH": 1492053214, + "__RESOLVED_ARTIFACTS_HASH": -1722641521, "artifacts": { "com.android.tools.analytics-library:protos": { "shasums": { @@ -185,15 +185,9 @@ }, "com.google.protobuf:protobuf-java": { "shasums": { - "jar": "16901851ebe5e89fe88aaad3c26866373695bc2e30627bb8932847e2f5fc2e76" + "jar": "8540247fad9e06baefa8fb45eb313802d019f485f14300e0f9d6b556ed88e753" }, - "version": "4.29.0" - }, - "com.google.protobuf:protobuf-java-util": { - "shasums": { - "jar": "1413fa2e13eecd323462884e13114ef655571c853cb4aac6a3e50a0d887c596e" - }, - "version": "4.29.0" + "version": "3.25.5" }, "com.sun.istack:istack-commons-runtime": { "shasums": { @@ -589,14 +583,6 @@ "com.google.jimfs:jimfs": [ "com.google.guava:guava" ], - "com.google.protobuf:protobuf-java-util": [ - "com.google.code.findbugs:jsr305", - "com.google.code.gson:gson", - "com.google.errorprone:error_prone_annotations", - "com.google.guava:guava", - "com.google.j2objc:j2objc-annotations", - "com.google.protobuf:protobuf-java" - ], "com.sun.istack:istack-commons-runtime": [ "jakarta.activation:jakarta.activation-api" ], @@ -2455,9 +2441,6 @@ "com.google.protobuf", "com.google.protobuf.compiler" ], - "com.google.protobuf:protobuf-java-util": [ - "com.google.protobuf.util" - ], "com.sun.istack:istack-commons-runtime": [ "com.sun.istack", "com.sun.istack.localization", @@ -3219,7 +3202,6 @@ "com.google.j2objc:j2objc-annotations", "com.google.jimfs:jimfs", "com.google.protobuf:protobuf-java", - "com.google.protobuf:protobuf-java-util", "com.sun.istack:istack-commons-runtime", "com.sun.xml.fastinfoset:FastInfoset", "com.xenomachina:kotlin-argparser", @@ -3289,7 +3271,6 @@ "com.google.j2objc:j2objc-annotations", "com.google.jimfs:jimfs", "com.google.protobuf:protobuf-java", - "com.google.protobuf:protobuf-java-util", "com.sun.istack:istack-commons-runtime", "com.sun.xml.fastinfoset:FastInfoset", "com.xenomachina:kotlin-argparser", diff --git a/src/worker/BUILD b/src/worker/BUILD index 350f515..acc9860 100644 --- a/src/worker/BUILD +++ b/src/worker/BUILD @@ -9,7 +9,7 @@ kt_jvm_library( deps = [ "@bazel_worker_java//:worker_protocol_java_proto", "@bazel_worker_java//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers", - "@rules_android_lint_deps//:com_google_protobuf_protobuf_java", + "@com_google_protobuf//:protobuf_java", ], )