Skip to content

Commit 27bcfab

Browse files
authored
Use worker proto from @bazel_tools (#1330)
This avoids needing to vendor our own copy.
1 parent 271df7f commit 27bcfab

File tree

6 files changed

+6
-88
lines changed

6 files changed

+6
-88
lines changed

src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ java_binary(
1515
"//src/java/io/bazel/rulesscala/io_utils",
1616
"//src/java/io/bazel/rulesscala/jar",
1717
"//src/java/io/bazel/rulesscala/worker",
18-
"//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
18+
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
1919
"@bazel_tools//tools/jdk:JacocoCoverage",
2020
],
2121
)

src/java/io/bazel/rulesscala/scalac/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ load(
88
SCALAC_DEPS = [
99
"//scala/private/toolchain_deps:scala_compile_classpath",
1010
"//src/java/io/bazel/rulesscala/io_utils",
11-
"//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
11+
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
1212
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
1313
"@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
1414
"@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto",

src/java/io/bazel/rulesscala/worker/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ java_library(
55
srcs = ["Worker.java"],
66
visibility = ["//visibility:public"],
77
deps = [
8-
"//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
8+
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
99
],
1010
)
1111

@@ -20,6 +20,6 @@ java_test(
2020
test_class = "io.bazel.rulesscala.worker.WorkerTest",
2121
deps = [
2222
":worker",
23-
"//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
23+
"@bazel_tools//src/main/protobuf:worker_protocol_java_proto",
2424
],
2525
)

test/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ scala_specs2_junit_test(
540540
name = "data_location_expansion",
541541
size = "small",
542542
srcs = ["src/main/scala/scalarules/test/location_expansion/LocationExpansionTest.scala"],
543-
data = ["//third_party/bazel/src/main/protobuf:worker_protocol_java_proto"],
544-
jvm_flags = ["-Dlocation.expanded='$(locations //third_party/bazel/src/main/protobuf:worker_protocol_java_proto)'"],
543+
data = ["@bazel_tools//src/main/protobuf:worker_protocol_java_proto"],
544+
jvm_flags = ["-Dlocation.expanded='$(locations @bazel_tools//src/main/protobuf:worker_protocol_java_proto)'"],
545545
suffixes = ["Test"],
546546
)
547547

third_party/bazel/src/main/protobuf/BUILD

-20
This file was deleted.

third_party/bazel/src/main/protobuf/worker_protocol.proto

-62
This file was deleted.

0 commit comments

Comments
 (0)