Skip to content

Commit 6fdd882

Browse files
committed
Add protobuf-java dependency, and explicitly declare those deps with TODOs for relevant tickets.
1 parent 3f8894b commit 6fdd882

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

Diff for: 3rdparty/jvm/com/google/protobuf/BUILD

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
jvm_artifact(
2+
group="com.google.protobuf",
3+
artifact="protobuf-java",
4+
version="3.21.0",
5+
)

Diff for: 3rdparty/jvm/default.lock

+14
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# "version": 1,
88
# "generated_with_requirements": [
99
# "com.google.guava:guava:31.0.1-jre,url=not_provided,jar=not_provided",
10+
# "com.google.protobuf:protobuf-java:3.21.0,url=not_provided,jar=not_provided",
1011
# "com.lihaoyi:acyclic_2.13:0.2.1,url=not_provided,jar=not_provided",
1112
# "org.scala-lang:scala-library:2.13.8,url=not_provided,jar=not_provided",
1213
# "org.scalatest:scalatest_2.13:3.2.10,url=not_provided,jar=not_provided"
@@ -165,6 +166,19 @@ serialized_bytes_length = 8781
165166
[[entries]]
166167
directDependencies = []
167168
dependencies = []
169+
file_name = "com.google.protobuf_protobuf-java_3.21.0.jar"
170+
171+
[entries.coord]
172+
group = "com.google.protobuf"
173+
artifact = "protobuf-java"
174+
version = "3.21.0"
175+
packaging = "jar"
176+
[entries.file_digest]
177+
fingerprint = "3d6bc9e4a87f293cb434b5a95c3011f72881a8517270c231dee035b215eb61df"
178+
serialized_bytes_length = 1692588
179+
[[entries]]
180+
directDependencies = []
181+
dependencies = []
168182
file_name = "com.lihaoyi_acyclic_2.13_0.2.1.jar"
169183

170184
[entries.coord]

Diff for: src/jvm/org/pantsbuild/example/lib/BUILD

+4
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@ java_sources(
33
# Resource dependencies cannot be inferred, so we must explicitly declare that we
44
# depend on them.
55
"src/resources/org/pantsbuild/example/lib",
6+
# TODO: Protobuf dependencies are not currently inferred.
7+
# see https://github.com/pantsbuild/pants/issues/14960
8+
"src/jvm/org/pantsbuild/example/proto",
9+
"3rdparty/jvm/com/google/protobuf",
610
],
711
)

Diff for: src/jvm/org/pantsbuild/example/proto/BUILD

+7-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
protobuf_sources(grpc=True)
1+
protobuf_sources(
2+
dependencies=[
3+
# TODO: The protobuf runtime is not automatically injected as a dependency of protobuf targets.
4+
# see https://github.com/pantsbuild/pants/pull/15006.
5+
"3rdparty/jvm/com/google/protobuf",
6+
],
7+
)

0 commit comments

Comments
 (0)