Added a Scala 3 toolchain for use in rules_scala

Jaden Peterson · Jaden Peterson · commit 16d68e9e2387 · 2025-01-15T00:05:13.000-05:00
diff --git a/WORKSPACE b/WORKSPACE
@@ -44,7 +44,13 @@ rules_proto_toolchains()
 
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(enable_compiler_dependency_tracking = True)
+scala_config(
+    enable_compiler_dependency_tracking = True,
+    scala_versions = [
+        "2.12.20",
+        "3.6.2",
+    ],
+)
 
 load("//scala:toolchains.bzl", "scala_toolchains")
 
diff --git a/scala/BUILD b/scala/BUILD
@@ -34,6 +34,7 @@ scala_toolchain(
 [
     toolchain(
         name = tc,
+        target_settings = ["@io_bazel_rules_scala_config//:scala_version" + version_suffix(SCALA_VERSION)],
         toolchain = tc + "_impl",
         toolchain_type = "//scala:toolchain_type",
         visibility = ["//visibility:public"],

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ scala_toolchain(`
`34`	`34`	`[`
`35`	`35`	`toolchain(`
`36`	`36`	`name = tc,`
	`37`	`+ target_settings = ["@io_bazel_rules_scala_config//:scala_version" + version_suffix(SCALA_VERSION)],`
`37`	`38`	`toolchain = tc + "_impl",`
`38`	`39`	`toolchain_type = "//scala:toolchain_type",`
`39`	`40`	`visibility = ["//visibility:public"],`