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()
44
44
45
45
load ("@io_bazel_rules_scala//:scala_config.bzl" , "scala_config" )
46
46
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 )
54
48
55
49
load ("//scala:toolchains.bzl" , "scala_toolchains" )
56
50
Original file line number Diff line number Diff line change @@ -39,6 +39,14 @@ def _store_config(repository_ctx):
39
39
elif scala_version not in scala_versions :
40
40
fail ("You have to include the default Scala version (%s) in the `scala_versions` list." % scala_version )
41
41
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
+
42
50
enable_compiler_dependency_tracking = repository_ctx .os .environ .get (
43
51
"ENABLE_COMPILER_DEPENDENCY_TRACKING" ,
44
52
str (repository_ctx .attr .enable_compiler_dependency_tracking ),
You can’t perform that action at this time.
0 commit comments