File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -44,13 +44,7 @@ rules_proto_toolchains()
4444
4545load ("@io_bazel_rules_scala//:scala_config.bzl" , "scala_config" )
4646
47- scala_config (
48- enable_compiler_dependency_tracking = True ,
49- scala_versions = [
50- "2.12.20" ,
51- "3.6.2" ,
52- ],
53- )
47+ scala_config (enable_compiler_dependency_tracking = True )
5448
5549load ("//scala:toolchains.bzl" , "scala_toolchains" )
5650
Original file line number Diff line number Diff line change @@ -39,6 +39,14 @@ def _store_config(repository_ctx):
3939 elif scala_version not in scala_versions :
4040 fail ("You have to include the default Scala version (%s) in the `scala_versions` list." % scala_version )
4141
42+ # dottyijar requires Scala v3.6.2, but we don't want to force the caller to always provide 3.6.2. Therefore, we
43+ # append it if it hasn't been provided.
44+ #
45+ # Once we move to Bzlmod, this shouldn't be a problem, since we can register a toolchain for Scala v3.6.2 without
46+ # requiring users of this ruleset to do so.
47+ if "3.6.2" not in scala_versions :
48+ scala_versions = scala_versions + ["3.6.2" ]
49+
4250 enable_compiler_dependency_tracking = repository_ctx .os .environ .get (
4351 "ENABLE_COMPILER_DEPENDENCY_TRACKING" ,
4452 str (repository_ctx .attr .enable_compiler_dependency_tracking ),
You can’t perform that action at this time.
0 commit comments