Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

specify deps for specs2 and specs2-junit deps #1002

Merged
merged 6 commits into from
Feb 18, 2020
Merged

specify deps for specs2 and specs2-junit deps #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d9eb89
specify deps for specs2 deps
ittaiz Feb 17, 2020
bea1047
Update specs2.bzl
ittaiz Feb 17, 2020
a25c202
Update specs2_junit.bzl
ittaiz Feb 17, 2020
1512ae5
Update specs2_junit.bzl
ittaiz Feb 17, 2020
7630c58
Update aspect.bzl
ittaiz Feb 17, 2020
0d53774
Update aspect.bzl
ittaiz Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions specs2/specs2.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -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,
)
Expand All @@ -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,
)
Expand Down
1 change: 1 addition & 0 deletions specs2/specs2_junit.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
8 changes: 6 additions & 2 deletions test/aspect/aspect.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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()
ittaiz marked this conversation as resolved.
Show resolved Hide resolved
if visited != expected:
content += """
echo Expected these deps from {name}: 1>&2
Expand Down