Skip to content

Commit e5a7b0e

Browse files
author
Jaden Peterson
committed
fixup! 16d68e9 Fixed failing tests
1 parent 501625e commit e5a7b0e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

WORKSPACE

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,7 @@ rules_proto_toolchains()
4444

4545
load("@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

5549
load("//scala:toolchains.bzl", "scala_toolchains")
5650

scala_config.bzl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff 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),

0 commit comments

Comments
 (0)