Upgrade Scala 2.12 LTS to 2.12.21 (#1808)

bartoszkosiorek · web-flow · commit e878efc31ee1 · 2026-02-05T21:49:23.000+01:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -10,13 +10,13 @@ module(
     compatibility_level = 7,
 )
 
-SCALA_VERSION = "2.12.20"
+SCALA_VERSION = "2.12.21"
 
 # These versions match those required by some tests, including
 # test_thirdparty_version.sh.
 SCALA_2_VERSIONS = [
     "2.11.12",
-    "2.12.20",
+    "2.12.21",
     "2.13.18",
 ]
 
diff --git a/docs/cross-compilation.md b/docs/cross-compilation.md
@@ -26,7 +26,7 @@ scala_config.settings(
     # No need to include `scala_version` in `scala_versions`.
     scala_versions = [
         "2.11.12",
-        "2.12.20",
+        "2.12.21",
         "3.1.3",
         "3.2.2",
         "3.3.7",
@@ -44,7 +44,7 @@ scala_config(
     # You _must_ include `scala_version` in `scala_versions`.
     scala_versions = [
         "2.11.12",
-        "2.12.20",
+        "2.12.21",
         "2.13.18",
         "3.1.3",
         "3.2.2",
diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh
@@ -93,6 +93,7 @@ $runner test_compiler_patch 2.12.17
 $runner test_compiler_patch 2.12.18
 $runner test_compiler_patch 2.12.19
 $runner test_compiler_patch 2.12.20
+$runner test_compiler_patch 2.12.21
 
 $runner test_compiler_patch 2.13.0
 $runner test_compiler_patch 2.13.1
@@ -141,6 +142,7 @@ $runner test_compiler_srcjar_nonhermetic 2.12.17
 $runner test_compiler_srcjar_nonhermetic 2.12.18
 $runner test_compiler_srcjar_nonhermetic 2.12.19
 $runner test_compiler_srcjar_nonhermetic 2.12.20
+$runner test_compiler_srcjar_nonhermetic 2.12.21
 
 $runner test_compiler_srcjar_nonhermetic 2.13.11
 $runner test_compiler_srcjar_nonhermetic 2.13.12
diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel
@@ -122,6 +122,10 @@ scala_deps.compiler_srcjar(
     url = "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar?foo",
     version = "2.12.20",
 )
+scala_deps.compiler_srcjar(
+    url = "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.21/scala-compiler-2.12.21-sources.jar?foo",
+    version = "2.12.21",
+)
 scala_deps.compiler_srcjar(
     url = "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo",
     version = "2.13.11",
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -107,6 +107,9 @@ srcjars_by_version = {
     "2.12.20": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar?foo",
     },
+    "2.12.21": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.21/scala-compiler-2.12.21-sources.jar?foo",
+    },
     "2.13.11": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo",
     },
diff --git a/examples/testing/multi_frameworks_toolchain/MODULE.bazel b/examples/testing/multi_frameworks_toolchain/MODULE.bazel
@@ -2,7 +2,7 @@
 
 module(name = "multi_frameworks_toolchain")
 
-SCALA_VERSION = "2.12.20"
+SCALA_VERSION = "2.12.21"
 
 VERSION_SUFFIX = "_" + SCALA_VERSION.replace(".", "_")
 
diff --git a/examples/twitter_scrooge/MODULE.bazel b/examples/twitter_scrooge/MODULE.bazel
@@ -35,7 +35,7 @@ scala_config = use_extension(
     "@rules_scala//scala/extensions:config.bzl",
     "scala_config",
 )
-scala_config.settings(scala_version = "2.12.20")
+scala_config.settings(scala_version = "2.12.21")
 
 scala_deps = use_extension(
     "@rules_scala//scala/extensions:deps.bzl",
diff --git a/examples/twitter_scrooge/WORKSPACE b/examples/twitter_scrooge/WORKSPACE
@@ -89,7 +89,7 @@ pinned_maven_install()
 
 load("@rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "2.12.20")
+scala_config(scala_version = "2.12.21")
 
 load(
     "@rules_scala//scala:toolchains.bzl",
diff --git a/scala/private/macros/compiler_sources_integrity.bzl b/scala/private/macros/compiler_sources_integrity.bzl
@@ -93,6 +93,10 @@ COMPILER_SOURCES = {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar",
         "integrity": "sha256-B8FAyBh6e8vPznUJ608XBPy/oSrTx3mPjdyrlHfcUCg=",
     },
+    "2.12.21": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.21/scala-compiler-2.12.21-sources.jar",
+        "integrity": "sha256-Q5Kl+qWZKLFk4/dUgjSjsoBNzUB7FiFNARdqfx9jpfE=",
+    },
     "2.13.0": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.0/scala-compiler-2.13.0-sources.jar",
         "integrity": "sha256-CJi/+Ctl9YPhqHLK3R8H43t9oQyop2N2chZiutCobOY=",
diff --git a/scala_config.bzl b/scala_config.bzl
@@ -1,7 +1,7 @@
 load("//scala:scala_cross_version.bzl", "extract_major_version", "extract_minor_version", "version_suffix")
 
 """Default Scala version for use in Maven coordinates"""
-DEFAULT_SCALA_VERSION = "2.12.20"
+DEFAULT_SCALA_VERSION = "2.12.21"
 
 def _validate_supported_scala_version(scala_major_version, scala_minor_version):
     if scala_major_version == "2.11" and int(scala_minor_version) != 12:
diff --git a/scripts/README.md b/scripts/README.md
@@ -50,7 +50,7 @@ options:
   --version SCALA_VERSION
                         Scala version for which to update repository
                         information; if not provided, updates all supported
-                        versions: 2.11.12, 2.12.20, 2.13.18, 3.1.3, 3.2.2,
+                        versions: 2.11.12, 2.12.21, 2.13.18, 3.1.3, 3.2.2,
                         3.3.7, 3.4.3, 3.5.2, 3.6.4, 3.7.4, 3.8.1
   --output_dir OUTPUT_DIR
                         Directory in which to generate or update repository
diff --git a/scripts/create_repository.py b/scripts/create_repository.py
@@ -16,7 +16,7 @@
 
 ROOT_SCALA_VERSIONS = [
     "2.11.12",
-    "2.12.20",
+    "2.12.21",
     "2.13.18",
     "3.1.3",
     "3.2.2",
diff --git a/scripts/update_compiler_sources_integrity.py b/scripts/update_compiler_sources_integrity.py
@@ -21,7 +21,7 @@
 SCALA_VERSIONS = [
     "2.11.12",
 ] + [
-    f'2.12.{patch}' for patch in range(1, 21)  # 2.12.1 to 2.12.20
+    f'2.12.{patch}' for patch in range(1, 22)  # 2.12.1 to 2.12.21
 ] + [
     f'2.13.{patch}' for patch in range(0, 19)  # 2.13.0 to 2.13.18
 ] + [
diff --git a/test/shell/test_coverage_equals_in_target.sh b/test/shell/test_coverage_equals_in_target.sh
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . "${dir}"/test_helper.sh
 runner=$(get_test_runner "${1:-local}")
 
-# Default to 2.12.20 for `diff` tests because other versions change the output.
-SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
+# Default to 2.12.21 for `diff` tests because other versions change the output.
+SCALA_VERSION="${SCALA_VERSION:-2.12.21}"
 
 test_coverage_target_name_contains_equals_sign() {
     bazel coverage \
diff --git a/test/shell/test_coverage_scalatest.sh b/test/shell/test_coverage_scalatest.sh
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . "${dir}"/test_helper.sh
 runner=$(get_test_runner "${1:-local}")
 
-# Default to 2.12.20 for `diff` tests because other versions change the output.
-SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
+# Default to 2.12.21 for `diff` tests because other versions change the output.
+SCALA_VERSION="${SCALA_VERSION:-2.12.21}"
 
 test_coverage_on() {
     bazel coverage \
diff --git a/test/shell/test_coverage_scalatest_resources.sh b/test/shell/test_coverage_scalatest_resources.sh
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . "${dir}"/test_helper.sh
 runner=$(get_test_runner "${1:-local}")
 
-# Default to 2.12.20 for `diff` tests because other versions change the output.
-SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
+# Default to 2.12.21 for `diff` tests because other versions change the output.
+SCALA_VERSION="${SCALA_VERSION:-2.12.21}"
 
 test_coverage_succeeds_resource_call() {
     bazel coverage \
diff --git a/test/shell/test_coverage_specs2_with_junit.sh b/test/shell/test_coverage_specs2_with_junit.sh
@@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . "${dir}"/test_helper.sh
 runner=$(get_test_runner "${1:-local}")
 
-# Default to 2.12.20 for `diff` tests because other versions change the output.
-SCALA_VERSION="${SCALA_VERSION:-2.12.20}"
+# Default to 2.12.21 for `diff` tests because other versions change the output.
+SCALA_VERSION="${SCALA_VERSION:-2.12.21}"
 
 test_coverage_on() {
     bazel coverage \
diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh
@@ -26,7 +26,7 @@ test_logs_not_contains() {
   _check_failing_action 'action_should_fail_without_message' "$@"
 }
 
-for scalaVersion in 2.12.20 2.13.18 3.3.7; do
+for scalaVersion in 2.12.21 2.13.18 3.3.7; do
   if [[ "$scalaVersion" == 3.* ]]; then
     $runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source"
   else
diff --git a/test/shell/test_scala_config.sh b/test/shell/test_scala_config.sh
@@ -6,7 +6,7 @@ runner=$(get_test_runner "${1:-local}")
 
 test_classpath_contains_2_12() {
   bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
-   --repo_env=SCALA_VERSION=2.12.20 \
+   --repo_env=SCALA_VERSION=2.12.21 \
    | grep scala-library-2.12
 }
 
diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel
@@ -22,7 +22,7 @@ scala_config.settings(
     scala_version = "3.1.3",
     scala_versions = [
         "2.11.12",
-        "2.12.20",
+        "2.12.21",
         "2.13.18",
         "3.1.3",
         "3.2.2",
diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE
@@ -61,7 +61,7 @@ scala_config(
     scala_version = "3.1.3",
     scala_versions = [
         "2.11.12",
-        "2.12.20",
+        "2.12.21",
         "2.13.18",
         "3.1.3",
         "3.2.2",
diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD
@@ -53,7 +53,7 @@ scalafmt_scala_binary(
     config = ":scala2-conf",
     format = True,
     main_class = "UnformattedBinary",
-    scala_version = "2.12.20",
+    scala_version = "2.12.21",
 )
 
 scalafmt_scala_binary(
@@ -62,7 +62,7 @@ scalafmt_scala_binary(
     config = ":scala2-conf",
     format = True,
     main_class = "UnformattedBinary",
-    scala_version = "2.12.20",
+    scala_version = "2.12.21",
 )
 
 scalafmt_scala_binary(
@@ -88,15 +88,15 @@ scalafmt_scala_test(
     srcs = ["unformatted/unformatted-test2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.12.20",
+    scala_version = "2.12.21",
 )
 
 scalafmt_scala_test(
     name = "formatted-test2",
     srcs = ["formatted/formatted-test2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.12.20",
+    scala_version = "2.12.21",
 )
 
 #default scala version is 3.1.3
diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh
@@ -19,7 +19,7 @@ $runner test_scala_version "3.8.1" # Latest Next version
 $runner test_scala_version "3.3.7" # 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.18"
-$runner test_scala_version "2.12.20"
+$runner test_scala_version "2.12.21"
 
 # Tests for other versions should be placed in dangerous_test_thirdparty_version.sh 
 # However that script is outdated and uses only default Scala version for each minor
diff --git a/test_version.sh b/test_version.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-scala_2_12_version="2.12.20"
+scala_2_12_version="2.12.21"
 scala_2_13_version="2.13.18"
 scala_3_version="3.3.7"
 
diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl
@@ -3,7 +3,7 @@
 Mostly generated and updated by scripts/create_repository.py.
 """
 
-scala_version = "2.12.20"
+scala_version = "2.12.21"
 
 artifacts = {
     "com_github_bigwheel_util_backports": {
@@ -182,17 +182,17 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_compiler": {
-        "artifact": "org.scala-lang:scala-compiler:2.12.20",
-        "sha256": "c88676d75c69721b717ea6c441ece04fff262abab9d210a2936abc2be3731fa2",
+        "artifact": "org.scala-lang:scala-compiler:2.12.21",
+        "sha256": "fb1bb6b0d7e8e922f03b5294ef0af23b9d2bd1cde6819ecb820c57210db4548e",
         "deps": [
-            "@io_bazel_rules_scala_scala_xml",
             "@io_bazel_rules_scala_scala_library",
             "@io_bazel_rules_scala_scala_reflect",
+            "@io_bazel_rules_scala_scala_xml",
         ],
     },
     "io_bazel_rules_scala_scala_library": {
-        "artifact": "org.scala-lang:scala-library:2.12.20",
-        "sha256": "4d8a8f984cce31a329a24f10b0bf336f042cb62aeb435290a1b20243154cfccb",
+        "artifact": "org.scala-lang:scala-library:2.12.21",
+        "sha256": "e2f4040c95cc4dd1cfeaae38bdde596e4b36933632451efa7d8564c6a359510c",
     },
     "io_bazel_rules_scala_scala_parser_combinators": {
         "artifact": "org.scala-lang.modules:scala-parser-combinators_2.12:2.4.0",
@@ -202,8 +202,8 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_reflect": {
-        "artifact": "org.scala-lang:scala-reflect:2.12.20",
-        "sha256": "5f1914cdc7a70580ea6038d929ebb25736ecf2234f677e2d47f8a4b2bc81e1fb",
+        "artifact": "org.scala-lang:scala-reflect:2.12.21",
+        "sha256": "8b91a08ba69a0564689793e732f06768d0914ec9e90fa8c3d1b55c5bf4600c14",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
         ],
@@ -421,8 +421,8 @@ artifacts = {
         ],
     },
     "org_scala_lang_scalap": {
-        "artifact": "org.scala-lang:scalap:2.12.20",
-        "sha256": "0b1fa8a5f222fdcace7e12378241bfc3ceabfaebd000a31e865a1111428eb283",
+        "artifact": "org.scala-lang:scalap:2.12.21",
+        "sha256": "e33e12ad739cd70db536b5e305a07d3b081490863f0db67a515d41585c087605",
         "deps": [
             "@io_bazel_rules_scala_scala_compiler",
         ],

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ module(`
`10`	`10`	`compatibility_level = 7,`
`11`	`11`	`)`
`12`	`12`
`13`		`-SCALA_VERSION = "2.12.20"`
	`13`	`+SCALA_VERSION = "2.12.21"`
`14`	`14`
`15`	`15`	`# These versions match those required by some tests, including`
`16`	`16`	`# test_thirdparty_version.sh.`
`17`	`17`	`SCALA_2_VERSIONS = [`
`18`	`18`	`"2.11.12",`
`19`		`- "2.12.20",`
	`19`	`+ "2.12.21",`
`20`	`20`	`"2.13.18",`
`21`	`21`	`]`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ scala_config = use_extension(`
`35`	`35`	`"@rules_scala//scala/extensions:config.bzl",`
`36`	`36`	`"scala_config",`
`37`	`37`	`)`
`38`		`-scala_config.settings(scala_version = "2.12.20")`
	`38`	`+scala_config.settings(scala_version = "2.12.21")`
`39`	`39`
`40`	`40`	`scala_deps = use_extension(`
`41`	`41`	`"@rules_scala//scala/extensions:deps.bzl",`