scala 3.4.2 support

bazelbuild · Aug 26, 2024 · 450b5bf · 450b5bf
1 parent 6c6ba4e
commit 450b5bf
Show file tree

Hide file tree

Showing 9 changed files with 558 additions and 1 deletion.
diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE
@@ -18,7 +18,7 @@ local_repository(
 
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "3.3.1")
+scala_config(scala_version = "3.4.2")
 
 load(
     "@io_bazel_rules_scala//scala:scala.bzl",

diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl
@@ -140,6 +140,7 @@ def _artifact_ids(scala_version):
         "io_bazel_rules_scala_scala_xml",
         "io_bazel_rules_scala_scala_parser_combinators",
         "io_bazel_rules_scala_scala_library_2",
+        "org_scala_sbt_compiler_interface",
     ]
 
 def rules_scala_toolchain_deps_repositories(

diff --git a/scala/private/macros/setup_scala_toolchain.bzl b/scala/private/macros/setup_scala_toolchain.bzl
@@ -116,6 +116,7 @@ _DEFAULT_DEPS = {
             "@io_bazel_rules_scala_scala_tasty_core",
             "@io_bazel_rules_scala_scala_asm",
             "@io_bazel_rules_scala_scala_library_2",
+            "@org_scala_sbt_compiler_interface",
         ],
     },
     "scala_library_classpath": {

diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh
@@ -41,6 +41,10 @@ function scala3_3_example() {
   test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.1 //..."
 }
 
+function scala3_4_example() {
+   test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.2 //..."
+ }
+
 function semanticdb_example() {
 
   function build_semanticdb_example(){
@@ -62,4 +66,5 @@ $runner semanticdb_example
 $runner scala3_1_example
 $runner scala3_2_example
 $runner scala3_3_example
+$runner scala3_4_example
 $runner cross_build_example
diff --git a/third_party/repositories/repositories.bzl b/third_party/repositories/repositories.bzl
@@ -28,6 +28,11 @@ load(
     _artifacts_3_3 = "artifacts",
     _scala_version_3_3 = "scala_version",
 )
+load(
+    "//third_party/repositories:scala_3_4.bzl",
+    _artifacts_3_4 = "artifacts",
+    _scala_version_3_4 = "scala_version",
+)
 load(
     "@io_bazel_rules_scala//scala:scala_cross_version.bzl",
     "default_maven_server_urls",
@@ -47,6 +52,7 @@ artifacts_by_major_scala_version = {
     "3.1": _artifacts_3_1,
     "3.2": _artifacts_3_2,
     "3.3": _artifacts_3_3,
+    "3.4": _artifacts_3_4,
 }
 
 scala_version_by_major_scala_version = {
@@ -56,6 +62,7 @@ scala_version_by_major_scala_version = {
     "3.1": _scala_version_3_1,
     "3.2": _scala_version_3_2,
     "3.3": _scala_version_3_3,
+    "3.4": _scala_version_3_4,
 }
 
 def repositories(

diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl
@@ -99,6 +99,10 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
+    "org_scala_sbt_compiler_interface": {
+        "artifact": "org.scala-sbt:compiler-interface:1.10.1",
+        "sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
+    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
         "sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",

diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl
@@ -99,6 +99,10 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
+    "org_scala_sbt_compiler_interface": {
+        "artifact": "org.scala-sbt:compiler-interface:1.10.1",
+        "sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
+    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
         "sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",

diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl
@@ -97,6 +97,10 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
+    "org_scala_sbt_compiler_interface": {
+        "artifact": "org.scala-sbt:compiler-interface:1.10.1",
+        "sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
+    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
         "sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",