move test_resolve_deps to private variable in scala_test.bzl

bazelbuild · Aug 17, 2019 · 6a30189 · 6a30189
1 parent 609c42f
commit 6a30189
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/scala/private/common_attributes.bzl b/scala/private/common_attributes.bzl
@@ -135,17 +135,3 @@ resolve_deps = {
         allow_files = False,
     ),
 }
-
-test_resolve_deps = {
-    "_scala_toolchain": attr.label_list(
-        default = [
-            Label(
-                "//external:io_bazel_rules_scala/dependency/scala/scala_library",
-            ),
-            Label(
-                "//external:io_bazel_rules_scala/dependency/scalatest/scalatest",
-            ),
-        ],
-        allow_files = False,
-    ),
-}
diff --git a/scala/private/rules/scala_test.bzl b/scala/private/rules/scala_test.bzl
@@ -5,7 +5,6 @@ load(
     "common_attrs",
     "implicit_deps",
     "launcher_template",
-    "test_resolve_deps",
 )
 load("@io_bazel_rules_scala//scala/private:common.bzl", "sanitize_string_for_usage")
 load("@io_bazel_rules_scala//scala/private:common_outputs.bzl", "common_outputs")
@@ -173,13 +172,27 @@ _scala_test_attrs = {
     ),
 }
 
+_test_resolve_deps = {
+    "_scala_toolchain": attr.label_list(
+        default = [
+            Label(
+                "//external:io_bazel_rules_scala/dependency/scala/scala_library",
+            ),
+            Label(
+                "//external:io_bazel_rules_scala/dependency/scalatest/scalatest",
+            ),
+        ],
+        allow_files = False,
+    ),
+}
+
 _scala_test_attrs.update(launcher_template)
 
 _scala_test_attrs.update(implicit_deps)
 
 _scala_test_attrs.update(common_attrs)
 
-_scala_test_attrs.update(test_resolve_deps)
+_scala_test_attrs.update(_test_resolve_deps)
 
 scala_test = rule(
     attrs = _scala_test_attrs,