Skip to content

Commit c4fa6c2

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 c4fa6c2

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

test/BUILD

Lines changed: 16 additions & 13 deletions
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,18 @@ 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(SCALA_VERSION, [
23+
"@io_bazel_rules_scala_junit_junit",
24+
])
25+
2026
# The examples below show how to combine Scala and Java rules.
2127
# ScalaBinary is the Scala equivalent of JavaBinary.
2228

@@ -491,7 +497,6 @@ scala_junit_test(
491497
"//test/src/main/resources/java_sources:CompiledWithJava11",
492498
"//test/src/main/resources/java_sources:CompiledWithJava8",
493499
],
494-
deps = ["@io_bazel_rules_scala_junit_junit"],
495500
)
496501

497502
# Generate a file containing the rootpaths of a Scala binary.
@@ -612,7 +617,7 @@ scala_library(
612617
scala_library(
613618
name = "customJunitRunner",
614619
srcs = ["src/main/scala/scalarules/test/junit/JunitCustomRunner.java"],
615-
deps = ["@io_bazel_rules_scala_junit_junit"],
620+
deps = _JUNIT_DEPS,
616621
)
617622

618623
# make sure making a fat jar strips signatures
@@ -698,7 +703,7 @@ check_statsfile("ScalaLibBinary")
698703
scala_library(
699704
name = "JunitSeparateTarget",
700705
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitSeparateTargetTest.scala"],
701-
deps = ["@io_bazel_rules_scala_junit_junit"],
706+
deps = _JUNIT_DEPS,
702707
)
703708

704709
scala_junit_test(
@@ -712,7 +717,7 @@ scala_junit_test(
712717
java_library(
713718
name = "JunitJavaSeparateTarget",
714719
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java"],
715-
deps = ["@io_bazel_rules_scala_junit_junit"],
720+
deps = _JUNIT_DEPS,
716721
)
717722

718723
scala_junit_test(
@@ -726,14 +731,14 @@ scala_junit_test(
726731
scala_library(
727732
name = "TargetWithTestThatShouldNotRun",
728733
srcs = ["src/main/scala/scalarules/test/junit/separate_target/FailingTest.scala"],
729-
deps = ["@io_bazel_rules_scala_junit_junit"],
734+
deps = _JUNIT_DEPS,
730735
)
731736

732737
scala_library(
733738
name = "JunitSeparateTargetWithDependencyOnTest",
734739
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitSeparateTargetTest.scala"],
735740
runtime_deps = [":TargetWithTestThatShouldNotRun"],
736-
deps = ["@io_bazel_rules_scala_junit_junit"],
741+
deps = _JUNIT_DEPS,
737742
)
738743

739744
scala_junit_test(
@@ -748,7 +753,7 @@ java_library(
748753
name = "JunitSeparateJavaTargetWithDependencyOnTest",
749754
srcs = ["src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java"],
750755
runtime_deps = [":TargetWithTestThatShouldNotRun"],
751-
deps = ["@io_bazel_rules_scala_junit_junit"],
756+
deps = _JUNIT_DEPS,
752757
)
753758

754759
scala_junit_test(
@@ -765,7 +770,7 @@ scala_library(
765770
"src/main/scala/scalarules/test/junit/separate_target/JunitJavaSeparateTargetTest.java",
766771
"src/main/scala/scalarules/test/junit/separate_target/SomeScalaClass.scala",
767772
],
768-
deps = ["@io_bazel_rules_scala_junit_junit"],
773+
deps = _JUNIT_DEPS,
769774
)
770775

771776
scala_junit_test(
@@ -783,7 +788,7 @@ scala_library(
783788
],
784789
# make sure java compilation toolchain matches runtime toolchain ie --target
785790
java_compile_toolchain = "@bazel_tools//tools/jdk:toolchain_java11",
786-
deps = ["@io_bazel_rules_scala_junit_junit"],
791+
deps = _JUNIT_DEPS,
787792
)
788793

789794
scala_junit_test(
@@ -800,7 +805,6 @@ scala_junit_test(
800805
size = "small",
801806
srcs = ["src/main/scala/scalarules/test/junit/JunitNoTestEnvironmentTest.scala"],
802807
suffixes = ["Test"],
803-
deps = ["@io_bazel_rules_scala_junit_junit"],
804808
)
805809

806810
scala_junit_test(
@@ -811,7 +815,6 @@ scala_junit_test(
811815
"my_env_var": "my_value",
812816
},
813817
suffixes = ["Test"],
814-
deps = ["@io_bazel_rules_scala_junit_junit"],
815818
)
816819

817820
py_binary(

0 commit comments

Comments
 (0)