Skip to content

Commit 2c72b48

Browse files
committed
Bazel always places JUnit in the unnamed module
1 parent fb840a5 commit 2c72b48

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

wpilibjExamples/build_java_examples.bzl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,8 @@ def build_tests(example_test_folders, snippet_test_folders):
170170
name = folder + "-test",
171171
srcs = native.glob(["src/test/java/org/wpilib/examples/" + folder + "/**/*.java"]) + native.glob(["**/module-info.java"]),
172172
javacopts = [
173-
# bazel may make the junit dependencies in either the correct modules, or treat them as unnamed modules
174-
# We add reads for both to ensure they're picked up
175-
"--add-reads=wpilib.examples=org.junit.jupiter.api,org.junit.jupiter.api.parallel,org.junit.jupiter.params,ALL-UNNAMED",
173+
# bazel places the JUnit libraries in the unnamed module
174+
"--add-reads=wpilib.examples=ALL-UNNAMED",
176175
] + patch_module(
177176
"wpilib.examples",
178177
["wpilibjExamples/src/test/java"],
@@ -194,6 +193,7 @@ def build_tests(example_test_folders, snippet_test_folders):
194193
"//wpiutil:wpiutil-java",
195194
"//epilogue-runtime:epilogue-java",
196195
"//romiVendordep:romiVendordep-java",
196+
"//telemetry:telemetry-java",
197197
"//xrpVendordep:xrpVendordep-java",
198198
"//wpiunits:wpiunits-java",
199199
],
@@ -205,9 +205,8 @@ def build_tests(example_test_folders, snippet_test_folders):
205205
name = folder + "-test",
206206
srcs = native.glob(["src/test/java/org/wpilib/snippets/" + folder + "/**/*.java"]) + native.glob(["**/module-info.java"]),
207207
javacopts = [
208-
# bazel may make the junit dependencies in either the correct modules, or treat them as unnamed modules
209-
# We add reads for both to ensure they're picked up
210-
"--add-reads=wpilib.examples=org.junit.jupiter.api,org.junit.jupiter.api.parallel,org.junit.jupiter.params,ALL-UNNAMED",
208+
# bazel places the JUnit libraries in the unnamed module
209+
"--add-reads=wpilib.examples=ALL-UNNAMED",
211210
] + patch_module(
212211
"wpilib.examples",
213212
["wpilibjExamples/src/test/java"],

0 commit comments

Comments
 (0)