Skip to content

Cleanup ScalacProvider leftovers after toolchains refactoring #1103

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

Merged
merged 2 commits into from
Sep 11, 2020
Merged

Cleanup ScalacProvider leftovers after toolchains refactoring #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74f2395
Don't use misleading depset in doc string
liucijus Sep 11, 2020
4c6b5e1
Remove unused ScalacProvider loads and mentions
liucijus Sep 11, 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
1 change: 0 additions & 1 deletion scala/private/toolchain_deps/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
load(":toolchain_dep_rules.bzl", "common_toolchain_deps")

# dependencies from ScalacProvider
common_toolchain_deps(
name = "scala_compile_classpath",
deps_id = "scala_compile_classpath",
Expand Down
7 changes: 5 additions & 2 deletions scala/private/toolchain_deps/toolchain_dep_rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
load("@io_bazel_rules_scala//scala:providers.bzl", _ScalacProvider = "ScalacProvider")
load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps", "java_info_for_deps")
load(
"//scala/private/toolchain_deps:toolchain_deps.bzl",
"expose_toolchain_deps",
"java_info_for_deps",
)

_toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type"

Expand Down
2 changes: 1 addition & 1 deletion scala/providers.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ScalacProvider = provider(
DepsInfo = provider(
doc = "Defines depset required by rules",
fields = {
"deps": "Depset",
"deps": "Deps",
"deps_id": "Identifier by which rules access this depset",
},
)
Expand Down
1 change: 0 additions & 1 deletion scala/scala_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
load(
"@io_bazel_rules_scala//scala:providers.bzl",
_DepsInfo = "DepsInfo",
_ScalacProvider = "ScalacProvider",
)

def _compute_strict_deps_mode(input_strict_deps_mode, dependency_mode):
Expand Down