Skip to content

Commit 200c51f

Browse files
committed
Fix the remaining default providers in setup_scala_toolchain
These should also point to Scala version-specific artifacts. See previous PR: #1561
1 parent fa23848 commit 200c51f

File tree

1 file changed

+25
-29
lines changed

1 file changed

+25
-29
lines changed

scala/private/macros/setup_scala_toolchain.bzl

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,23 @@ def setup_scala_toolchain(
4949
deps = scala_macro_classpath,
5050
)
5151

52-
if scala_xml_deps != None:
53-
declare_deps_provider(
54-
name = scala_xml_provider,
55-
deps_id = "scala_xml",
56-
visibility = visibility,
57-
deps = scala_xml_deps,
58-
)
59-
else:
60-
scala_xml_provider = "@io_bazel_rules_scala//scala:scala_xml_provider"
52+
if scala_xml_deps == None:
53+
scala_xml_deps = default_deps("scala_xml", scala_version)
54+
declare_deps_provider(
55+
name = scala_xml_provider,
56+
deps_id = "scala_xml",
57+
visibility = visibility,
58+
deps = scala_xml_deps,
59+
)
6160

62-
if parser_combinators_deps != None:
63-
declare_deps_provider(
64-
name = parser_combinators_provider,
65-
deps_id = "parser_combinators",
66-
visibility = visibility,
67-
deps = parser_combinators_deps,
68-
)
69-
else:
70-
parser_combinators_provider = "@io_bazel_rules_scala//scala:parser_combinators_provider"
61+
if parser_combinators_deps == None:
62+
parser_combinators_deps = default_deps("parser_combinators", scala_version)
63+
declare_deps_provider(
64+
name = parser_combinators_provider,
65+
deps_id = "parser_combinators",
66+
visibility = visibility,
67+
deps = parser_combinators_deps,
68+
)
7169

7270
dep_providers = [
7371
scala_xml_provider,
@@ -78,17 +76,15 @@ def setup_scala_toolchain(
7876
]
7977

8078
if enable_semanticdb == True:
81-
if semanticdb_deps != None:
82-
declare_deps_provider(
83-
name = semanticdb_deps_provider,
84-
deps_id = "semanticdb",
85-
deps = [semanticdb_deps],
86-
visibility = visibility,
87-
)
88-
89-
dep_providers.append(semanticdb_deps_provider)
90-
else:
91-
dep_providers.append("@io_bazel_rules_scala//scala:semanticdb_provider")
79+
if semanticdb_deps == None:
80+
semanticdb_deps = default_deps("semanticdb", scala_version)
81+
declare_deps_provider(
82+
name = semanticdb_deps_provider,
83+
deps_id = "semanticdb",
84+
deps = semanticdb_deps,
85+
visibility = visibility,
86+
)
87+
dep_providers.append(semanticdb_deps_provider)
9288

9389
scala_toolchain(
9490
name = "%s_impl" % name,

0 commit comments

Comments
 (0)