From 2d9eb89fc39a165b26c5e4270ed844770aec682c Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:22:25 +0200 Subject: [PATCH 1/6] specify deps for specs2 deps needed for strict-deps/unused-deps --- specs2/specs2.bzl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specs2/specs2.bzl b/specs2/specs2.bzl index e256a6a17..8e4fc8d28 100644 --- 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, ) From bea104746047433ce4a8f9ca28925e0f4790fba9 Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:28:10 +0200 Subject: [PATCH 2/6] Update specs2.bzl --- specs2/specs2.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs2/specs2.bzl b/specs2/specs2.bzl index 8e4fc8d28..623d0e0db 100644 --- a/specs2/specs2.bzl +++ b/specs2/specs2.bzl @@ -56,7 +56,7 @@ def specs2_repositories( 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", + "@io_bazel_rules_scala_org_specs2_specs2_matcher", ], licenses = ["notice"], server_urls = maven_servers, From a25c202a9f94cb76a8f3997bacea81ae01c408ff Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:28:48 +0200 Subject: [PATCH 3/6] Update specs2_junit.bzl --- specs2/specs2_junit.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/specs2/specs2_junit.bzl b/specs2/specs2_junit.bzl index 8dd9e51d6..9e9d5412a 100644 --- 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, ) From 1512ae58c6fa6bb97879dd0581a4fa19e9741686 Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:32:20 +0200 Subject: [PATCH 4/6] Update specs2_junit.bzl --- specs2/specs2_junit.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs2/specs2_junit.bzl b/specs2/specs2_junit.bzl index 9e9d5412a..9c9885b2c 100644 --- a/specs2/specs2_junit.bzl +++ b/specs2/specs2_junit.bzl @@ -42,7 +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"] + deps = ["@io_bazel_rules_scala_org_specs2_specs2_core"], licenses = ["notice"], server_urls = maven_servers, ) From 7630c586c494b5844dcda134902dda5c8ac3cb59 Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:53:46 +0200 Subject: [PATCH 5/6] Update aspect.bzl --- test/aspect/aspect.bzl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl index 183397441..e597b1eb4 100644 --- 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", From 0d53774747f8b7dce909956a4fc7bb01ca5f8962 Mon Sep 17 00:00:00 2001 From: Ittai Zeidman Date: Mon, 17 Feb 2020 22:59:47 +0200 Subject: [PATCH 6/6] Update aspect.bzl --- test/aspect/aspect.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl index e597b1eb4..5ff91072d 100644 --- a/test/aspect/aspect.bzl +++ b/test/aspect/aspect.bzl @@ -57,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