Skip to content

Commit 61dfa2e

Browse files
committed
Extract versioned _JUNIT_DEPS in test/BUILD
Eliminates reliance on the default `@io_bazel_rules_scala_junit_junit` artifact repository.
1 parent 3d2c94d commit 61dfa2e

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

test/BUILD

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
load("@rules_python//python:defs.bzl", "py_binary")
2-
load("@rules_java//java:defs.bzl", "java_binary", "java_library")
31
load(
42
"//scala:scala.bzl",
53
"scala_binary",
@@ -13,10 +11,21 @@ load(
1311
"scala_test",
1412
"scala_test_suite",
1513
)
14+
load("//scala:scala_cross_version.bzl", "repositories")
1615
load(":check_statsfile.bzl", "check_statsfile")
16+
load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
17+
load("@rules_java//java:defs.bzl", "java_binary", "java_library")
18+
load("@rules_python//python:defs.bzl", "py_binary")
1719

1820
package(default_testonly = 1)
1921

22+
_JUNIT_DEPS = repositories(
23+
SCALA_VERSION,
24+
[
25+
"@io_bazel_rules_scala_junit_junit",
26+
],
27+
)
28+
2029
# The examples below show how to combine Scala and Java rules.
2130
# ScalaBinary is the Scala equivalent of JavaBinary.
2231

@@ -491,7 +500,6 @@ scala_junit_test(
491500
"//test/src/main/resources/java_sources:CompiledWithJava11",
492501
"//test/src/main/resources/java_sources:CompiledWithJava8",
493502
],
494-
deps = ["@io_bazel_rules_scala_junit_junit"],
495503
)
496504

497505
# Generate a file containing the rootpaths of a Scala binary.
@@ -612,7 +620,7 @@ scala_library(
612620
scala_library(
613621
name = "customJunitRunner",
614622
srcs = ["src/main/scala/scalarules/test/junit/JunitCustomRunner.java"],
615-
deps = ["@io_bazel_rules_scala_junit_junit"],
623+
deps = _JUNIT_DEPS,
616624
)
617625

618626
# make sure making a fat jar strips signatures
@@ -698,7 +706,7 @@ check_statsfile("ScalaLibBinary")
698706
scala_library(
699707
name = "JunitSeparateTarget",
700708
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitSeparateTargetTest.scala"],
701-
deps = ["@io_bazel_rules_scala_junit_junit"],
709+
deps = _JUNIT_DEPS,
702710
)
703711

704712
scala_junit_test(
@@ -712,7 +720,7 @@ scala_junit_test(
712720
java_library(
713721
name = "JunitJavaSeparateTarget",
714722
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java"],
715-
deps = ["@io_bazel_rules_scala_junit_junit"],
723+
deps = _JUNIT_DEPS,
716724
)
717725

718726
scala_junit_test(
@@ -726,14 +734,14 @@ scala_junit_test(
726734
scala_library(
727735
name = "TargetWithTestThatShouldNotRun",
728736
srcs = ["src/main/scala/scalarules/test/junit/separate_target/FailingTest.scala"],
729-
deps = ["@io_bazel_rules_scala_junit_junit"],
737+
deps = _JUNIT_DEPS,
730738
)
731739

732740
scala_library(
733741
name = "JunitSeparateTargetWithDependencyOnTest",
734742
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitSeparateTargetTest.scala"],
735743
runtime_deps = [":TargetWithTestThatShouldNotRun"],
736-
deps = ["@io_bazel_rules_scala_junit_junit"],
744+
deps = _JUNIT_DEPS,
737745
)
738746

739747
scala_junit_test(
@@ -748,7 +756,7 @@ java_library(
748756
name = "JunitSeparateJavaTargetWithDependencyOnTest",
749757
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java"],
750758
runtime_deps = [":TargetWithTestThatShouldNotRun"],
751-
deps = ["@io_bazel_rules_scala_junit_junit"],
759+
deps = _JUNIT_DEPS,
752760
)
753761

754762
scala_junit_test(
@@ -765,7 +773,7 @@ scala_library(
765773
"src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java",
766774
"src/main/scala/scalarules/test/junit/separate_target/SomeScalaClass.scala",
767775
],
768-
deps = ["@io_bazel_rules_scala_junit_junit"],
776+
deps = _JUNIT_DEPS,
769777
)
770778

771779
scala_junit_test(
@@ -783,7 +791,7 @@ scala_library(
783791
],
784792
# make sure java compilation toolchain matches runtime toolchain ie --target
785793
java_compile_toolchain = "@bazel_tools//tools/jdk:toolchain_java11",
786-
deps = ["@io_bazel_rules_scala_junit_junit"],
794+
deps = _JUNIT_DEPS,
787795
)
788796

789797
scala_junit_test(
@@ -800,7 +808,6 @@ scala_junit_test(
800808
size = "small",
801809
srcs = ["src/main/scala/scalarules/test/junit/JunitNoTestEnvironmentTest.scala"],
802810
suffixes = ["Test"],
803-
deps = ["@io_bazel_rules_scala_junit_junit"],
804811
)
805812

806813
scala_junit_test(
@@ -811,7 +818,6 @@ scala_junit_test(
811818
"my_env_var": "my_value",
812819
},
813820
suffixes = ["Test"],
814-
deps = ["@io_bazel_rules_scala_junit_junit"],
815821
)
816822

817823
py_binary(

0 commit comments

Comments
 (0)