Add Scala 3.6.2 support (bazelbuild#1672)

mbland · Dec 16, 2024 · 719f353 · 719f353
1 parent 6a97ace
commit 719f353
Show file tree

Hide file tree

Showing 8 changed files with 950 additions and 4 deletions.
diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh
@@ -122,6 +122,7 @@ run_test_local test_compiler_patch 3.2.2
 run_test_local test_compiler_patch 3.3.4 
 run_test_local test_compiler_patch 3.4.3
 run_test_local test_compiler_patch 3.5.2
+run_test_local test_compiler_patch 3.6.2
 
 run_test_local test_compiler_srcjar_error 2.12.11
 run_test_local test_compiler_srcjar_error 2.12.12
@@ -152,3 +153,4 @@ run_test_local test_compiler_srcjar 3.2.2
 run_test_local test_compiler_srcjar_nonhermetic 3.3.4
 run_test_local test_compiler_srcjar 3.4.3
 run_test_local test_compiler_srcjar_nonhermetic 3.5.2
+run_test_local test_compiler_srcjar_nonhermetic 3.6.2
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -108,6 +108,9 @@ srcjars_by_version = {
     "3.5.2": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.5.2/scala3-compiler_3-3.5.2-sources.jar",
     },
+    "3.6.2": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.2/scala3-compiler_3-3.6.2-sources.jar",
+    },
 }
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")

diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE
@@ -29,7 +29,7 @@ local_repository(
 
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "3.5.2")
+scala_config(scala_version = "3.6.2")
 
 load("@io_bazel_rules_scala//scala:scala.bzl", "scala_toolchains")
 

diff --git a/scripts/create_repository.py b/scripts/create_repository.py
@@ -23,6 +23,7 @@
     "3.3.4",
     "3.4.3",
     "3.5.2",
+    "3.6.2"
 ]
 PARSER_COMBINATORS_VERSION = '1.1.2'
 SBT_COMPILER_INTERFACE_VERSION = '1.10.4'

diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh
@@ -43,11 +43,15 @@ function scala3_3_example() {
 
 function scala3_4_example() {
    test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.3 //..."
- }
+}
 
 function scala3_5_example() {
    test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.2 //..."
- }
+}
+
+function scala3_6_example() {
+   test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.2 //..."
+}
 
 function semanticdb_example() {
 
@@ -72,4 +76,5 @@ $runner scala3_2_example
 $runner scala3_3_example
 $runner scala3_4_example
 $runner scala3_5_example
+$runner scala3_6_example
 $runner cross_build_example
diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh
@@ -15,7 +15,7 @@ runner=$(get_test_runner "${1:-local}")
 
 
 # Latest version of each major version
-$runner test_scala_version "3.5.2" # Latest Next version
+$runner test_scala_version "3.6.2" # Latest Next version
 $runner test_scala_version "3.3.4" # Latest LTS version
 $runner test_scala_version "3.1.3" # First supported major for Scala 3, max supported JDK=18
 $runner test_scala_version "2.13.15"

diff --git a/third_party/repositories/repositories.bzl b/third_party/repositories/repositories.bzl
@@ -38,6 +38,11 @@ load(
     _artifacts_3_5 = "artifacts",
     _scala_version_3_5 = "scala_version",
 )
+load(
+    "//third_party/repositories:scala_3_6.bzl",
+    _artifacts_3_6 = "artifacts",
+    _scala_version_3_6 = "scala_version",
+)
 load(
     "@io_bazel_rules_scala//scala:scala_cross_version.bzl",
     "default_maven_server_urls",
@@ -59,6 +64,7 @@ artifacts_by_major_scala_version = {
     "3.3": _artifacts_3_3,
     "3.4": _artifacts_3_4,
     "3.5": _artifacts_3_5,
+    "3.6": _artifacts_3_6,
 }
 
 scala_version_by_major_scala_version = {
@@ -70,6 +76,7 @@ scala_version_by_major_scala_version = {
     "3.3": _scala_version_3_3,
     "3.4": _scala_version_3_4,
     "3.5": _scala_version_3_5,
+    "3.6": _scala_version_3_6,
 }
 
 def repositories(