specify deps for specs2 and specs2-junit deps (#1002)

* specify deps for specs2 deps needed for strict-deps/unused-deps * Update specs2.bzl * Update specs2_junit.bzl * Update specs2_junit.bzl * Update aspect.bzl * Update aspect.bzl
bazelbuild · Feb 18, 2020 · b0fc510 · b0fc510
1 parent c734eb3
commit b0fc510
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/specs2/specs2.bzl b/specs2/specs2.bzl
@@ -42,6 +42,7 @@ def specs2_repositories(
             major_version,
         ),
         artifact_sha256 = scala_version_jar_shas["specs2_common"],
+        deps = ["@io_bazel_rules_scala_org_specs2_specs2_fp"],
         licenses = ["notice"],
         server_urls = maven_servers,
     )
@@ -53,6 +54,10 @@ def specs2_repositories(
             major_version,
         ),
         artifact_sha256 = scala_version_jar_shas["specs2_core"],
+        deps = [
+            "@io_bazel_rules_scala_org_specs2_specs2_common",
+            "@io_bazel_rules_scala_org_specs2_specs2_matcher",
+        ],
         licenses = ["notice"],
         server_urls = maven_servers,
     )
@@ -75,6 +80,7 @@ def specs2_repositories(
             major_version,
         ),
         artifact_sha256 = scala_version_jar_shas["specs2_matcher"],
+        deps = ["@io_bazel_rules_scala_org_specs2_specs2_common"],
         licenses = ["notice"],
         server_urls = maven_servers,
     )

diff --git a/specs2/specs2_junit.bzl b/specs2/specs2_junit.bzl
@@ -42,6 +42,7 @@ def specs2_junit_repositories(
             major_version,
         ),
         artifact_sha256 = scala_jar_shas[major_version]["specs2_junit"],
+        deps = ["@io_bazel_rules_scala_org_specs2_specs2_core"],
         licenses = ["notice"],
         server_urls = maven_servers,
     )

diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl
@@ -43,6 +43,10 @@ def _rule_impl(ctx):
             "@io_bazel_rules_scala_org_hamcrest_hamcrest_core//:io_bazel_rules_scala_org_hamcrest_hamcrest_core",
             # From specs2/specs2.bzl:specs2_dependencies()
             "@io_bazel_rules_scala//specs2:specs2",
+            "@io_bazel_rules_scala_org_specs2_specs2_common//:io_bazel_rules_scala_org_specs2_specs2_common",
+            "@io_bazel_rules_scala_org_specs2_specs2_core//:io_bazel_rules_scala_org_specs2_specs2_core",
+            "@io_bazel_rules_scala_org_specs2_specs2_fp//:io_bazel_rules_scala_org_specs2_specs2_fp",
+            "@io_bazel_rules_scala_org_specs2_specs2_matcher//:io_bazel_rules_scala_org_specs2_specs2_matcher",
             "@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml",
             "@io_bazel_rules_scala_scala_parser_combinators//:io_bazel_rules_scala_scala_parser_combinators",
             "@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
@@ -53,8 +57,8 @@ def _rule_impl(ctx):
     }
     content = ""
     for target in ctx.attr.targets:
-        visited = sorted(target.visited)
-        expected = sorted(expected_deps[target.label.name])
+        visited = depset(sorted(target.visited)).to_list()
+        expected = depset(sorted(expected_deps[target.label.name])).to_list()
         if visited != expected:
             content += """
             echo Expected these deps from {name}: 1>&2