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

Proposal: Deps Toolchain Infrastructure #1067

Closed
wants to merge 5 commits into from
+557 −101
Closed

Proposal: Deps Toolchain Infrastructure #1067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d64671e
Add deps toolchain infra
Jul 1, 2020
0e877d7
Use deps toolchain instead of binds
Jul 7, 2020
bddcfb5
Add deps toolchain for ScalaPB
Jul 1, 2020
5c2568a
Add deps toolchain for Specs2
Jul 7, 2020
ee2c951
Add deps toolchain for ScalaTest
Jul 8, 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
21 changes: 15 additions & 6 deletions specs2/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
load("@rules_java//java:defs.bzl", "java_import")
load("//specs2/toolchain:toolchain.bzl", "specs2_toolchain_deps")

package(default_visibility = ["//visibility:public"])

java_import(
name = "specs2",
jars = [],
exports = [
"@io_bazel_rules_scala_org_specs2_specs2_common",
"@io_bazel_rules_scala_org_specs2_specs2_core",
"@io_bazel_rules_scala_org_specs2_specs2_fp",
"@io_bazel_rules_scala_org_specs2_specs2_matcher",
":specs2_classpath",
],
deps = [
"//scala/private/toolchain_deps:scala_library_classpath",
"//scala/private/toolchain_deps:scala_xml",
"@io_bazel_rules_scala//scala/private/toolchain_deps:parser_combinators",
"@io_bazel_rules_scala//scala/private/toolchain_deps:scala_library_classpath",
"@io_bazel_rules_scala//scala/private/toolchain_deps:scala_xml",
],
)

specs2_toolchain_deps(
name = "specs2_classpath",
provider_id = "specs2",
)

specs2_toolchain_deps(
name = "specs2_junit_classpath",
provider_id = "specs2_junit",
)
2 changes: 1 addition & 1 deletion specs2/specs2.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ def specs2_repositories(
)

def specs2_dependencies():
return ["//external:io_bazel_rules_scala/dependency/specs2/specs2"]
return ["@io_bazel_rules_scala//specs2:specs2"]
42 changes: 42 additions & 0 deletions specs2/toolchain/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
load("@io_bazel_rules_scala//scala:providers.bzl", "declare_deps_provider")
load("//scala/toolchains:toolchains.bzl", "declare_deps_toolchain")

toolchain_type(
name = "specs2_toolchain_type",
visibility = ["//visibility:public"],
)

toolchain(
name = "specs2_toolchain",
toolchain = ":specs2_toolchain_impl",
toolchain_type = ":specs2_toolchain_type",
visibility = ["//visibility:public"],
)

declare_deps_provider(
name = "specs2_deps_provider",
visibility = ["//visibility:public"],
deps = [
"@io_bazel_rules_scala_org_specs2_specs2_common",
"@io_bazel_rules_scala_org_specs2_specs2_core",
"@io_bazel_rules_scala_org_specs2_specs2_fp",
"@io_bazel_rules_scala_org_specs2_specs2_matcher",
],
)

declare_deps_provider(
name = "specs2_junit_deps_provider",
visibility = ["//visibility:public"],
deps = [
"//external:io_bazel_rules_scala/dependency/specs2/specs2_junit",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just leftovers, right? doesn't have to still be bind

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR does not remove binds, it just makes changes required to be able to remove them in the future. Simply removing binds will break some users. I don't think we want to force existing users to stop using binds right away, no? I think we should do binds removal as a separate PR.

],
)

declare_deps_toolchain(
name = "specs2_toolchain_impl",
dep_providers = {
":specs2_deps_provider": "specs2",
":specs2_junit_deps_provider": "specs2_junit",
},
visibility = ["//visibility:public"],
)
17 changes: 17 additions & 0 deletions specs2/toolchain/toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
load("@io_bazel_rules_scala//scala:providers.bzl", "DepsInfo")
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")

toolchain_type_label = "@io_bazel_rules_scala//specs2/toolchain:specs2_toolchain_type"

def _toolchain_deps(ctx):
return expose_toolchain_deps(ctx, toolchain_type_label)

specs2_toolchain_deps = rule(
implementation = _toolchain_deps,
attrs = {
"provider_id": attr.string(
mandatory = True,
),
},
toolchains = [toolchain_type_label],
)
24 changes: 9 additions & 15 deletions test/aspect/aspect.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,30 @@ def _rule_impl(ctx):
expected_deps = {
"scala_library": [
"//test/aspect:scala_library",
"@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
"//scala/private/toolchain_deps:scala_library_classpath",
],
"scala_test": [
"//test/aspect:scala_test",
"@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala//scala/scalatest:scalatest",
"//scala/private/toolchain_deps:scala_library_classpath",
"//scala/scalatest/toolchain:scalatest_classapth",
],
"scala_junit_test": [
"//test/aspect:scala_junit_test",
"@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
"//scala/private/toolchain_deps:scala_library_classpath",
"@io_bazel_rules_scala_junit_junit//:io_bazel_rules_scala_junit_junit",
"@io_bazel_rules_scala_org_hamcrest_hamcrest_core//:io_bazel_rules_scala_org_hamcrest_hamcrest_core",
],
"scala_specs2_junit_test": [
"//test/aspect:scala_specs2_junit_test",
"@io_bazel_rules_scala_scala_library//:io_bazel_rules_scala_scala_library",
"//scala/private/toolchain_deps:scala_library_classpath",
"@io_bazel_rules_scala_junit_junit//:io_bazel_rules_scala_junit_junit",
"@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",
"@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
"//specs2:specs2",
"//scala/private/toolchain_deps:scala_xml",
"//scala/private/toolchain_deps:parser_combinators",
# From specs2/specs2_junit.bzl:specs2_junit_dependencies()
"@io_bazel_rules_scala_org_specs2_specs2_junit//:io_bazel_rules_scala_org_specs2_specs2_junit",
"//specs2:specs2_junit_classpath",
],
}
content = ""
Expand Down