Upgrade Scala 2.13 LTS to 2.13.18 (#1807)

bartoszkosiorek · web-flow · commit 1ea8be6da46b · 2026-02-05T21:15:23.000+01:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -17,7 +17,7 @@ SCALA_VERSION = "2.12.20"
 SCALA_2_VERSIONS = [
     "2.11.12",
     "2.12.20",
-    "2.13.17",
+    "2.13.18",
 ]
 
 SCALA_3_VERSIONS = [
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ scala_config = use_extension(
     "@rules_scala//scala/extensions:config.bzl",
     "scala_config",
 )
-scala_config.settings(scala_version = "2.13.17")
+scala_config.settings(scala_version = "2.13.18")
 
 # See the `scala/extensions/deps.bzl` docstring for a high level description of
 # the tag classes exported by this module extension.
@@ -279,7 +279,7 @@ load("@rules_scala//:scala_config.bzl", "scala_config")
 #
 # 2.12 is the default version. Use other versions by passing them explicitly:
 #
-#   scala_config(scala_version = "2.13.17")
+#   scala_config(scala_version = "2.13.18")
 #
 # You may define your own custom toolchain using Maven artifact dependencies
 # configured by your `WORKSPACE` file, imported using an external loader like
@@ -956,7 +956,7 @@ rules_scala_toolchain_deps_repositories(fetch_sources = True)
 
 load("@rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "2.13.17")
+scala_config(scala_version = "2.13.18")
 
 load(
     "//testing:scalatest.bzl",
@@ -992,7 +992,7 @@ rules_scala_dependencies()
 
 load("@rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "2.13.17")
+scala_config(scala_version = "2.13.18")
 
 load(
     "@rules_scala//scala:toolchains.bzl",
@@ -1116,7 +1116,7 @@ scala_config = use_extension(
     "@rules_scala//scala/extensions:config.bzl",
     "scala_config",
 )
-scala_config.settings(scala_version = "2.13.17")
+scala_config.settings(scala_version = "2.13.18")
 
 scala_deps = use_extension(
     "@rules_scala//scala/extensions:deps.bzl",
diff --git a/docs/cross-compilation.md b/docs/cross-compilation.md
@@ -22,7 +22,7 @@ scala_config = use_extension(
 )
 
 scala_config.settings(
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
     # No need to include `scala_version` in `scala_versions`.
     scala_versions = [
         "2.11.12",
@@ -45,7 +45,7 @@ scala_config(
     scala_versions = [
         "2.11.12",
         "2.12.20",
-        "2.13.17",
+        "2.13.18",
         "3.1.3",
         "3.2.2",
         "3.3.7",
diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh
@@ -109,6 +109,7 @@ $runner test_compiler_patch 2.13.12
 $runner test_compiler_patch 2.13.14
 $runner test_compiler_patch 2.13.15
 $runner test_compiler_patch 2.13.17
+$runner test_compiler_patch 2.13.18
 
 $runner test_compiler_patch 3.1.0 # Minimal supported version
 $runner test_compiler_patch 3.1.3
@@ -146,6 +147,7 @@ $runner test_compiler_srcjar_nonhermetic 2.13.12
 $runner test_compiler_srcjar_nonhermetic 2.13.14
 $runner test_compiler_srcjar_nonhermetic 2.13.15
 $runner test_compiler_srcjar_nonhermetic 2.13.17
+$runner test_compiler_srcjar_nonhermetic 2.13.18
 
 $runner test_compiler_srcjar 3.1.3
 $runner test_compiler_srcjar 3.2.2
diff --git a/dt_patches/test_dt_patches/MODULE.bazel.lock b/dt_patches/test_dt_patches/MODULE.bazel.lock
diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel
@@ -146,6 +146,10 @@ scala_deps.compiler_srcjar(
     url = "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.17/scala-compiler-2.13.17-sources.jar?foo",
     version = "2.13.17",
 )
+scala_deps.compiler_srcjar(
+    url = "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.18/scala-compiler-2.13.18-sources.jar?foo",
+    version = "2.13.18",
+)
 scala_deps.compiler_srcjar(
     integrity = "sha384-4J2ihR1QSdP5cvL3y2OUfw4uUX/hsQqcPlJV+IrQdsM/soiIAYfoEeIEt6vl3xBk",
     url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.1.3/scala3-compiler_3-3.1.3-sources.jar",
diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel.lock b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel.lock
diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE
@@ -125,6 +125,9 @@ srcjars_by_version = {
     "2.13.17": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.17/scala-compiler-2.13.17-sources.jar?foo",
     },
+    "2.13.18": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.18/scala-compiler-2.13.18-sources.jar?foo",
+    },
     "3.1.3": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.1.3/scala3-compiler_3-3.1.3-sources.jar",
         "integrity": "sha384-4J2ihR1QSdP5cvL3y2OUfw4uUX/hsQqcPlJV+IrQdsM/soiIAYfoEeIEt6vl3xBk",
diff --git a/examples/crossbuild/1_single/BUILD b/examples/crossbuild/1_single/BUILD
@@ -14,7 +14,7 @@ scala_library(
 scala_test(
     name = "test213",
     srcs = ["test.scala"],
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
 )
 
 # This one will be compiled by 3.3 compiler (the default one):
diff --git a/examples/crossbuild/2_deps/BUILD b/examples/crossbuild/2_deps/BUILD
@@ -19,7 +19,7 @@ scala_binary(
     name = "bin213",
     srcs = ["bin.scala"],  # compiled with 2.13 (as per `scala_version`)
     main_class = "C",
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
     deps = [
         ":lib",  # compiled 2.13 (as per `scala_version`)
         ":lib211",  # compiled with 2.11 (that target overrides version)
diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD
@@ -22,7 +22,7 @@ scala_binary(
     name = "bin2",
     srcs = ["bin.scala"],
     main_class = "B",
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
     deps = [":lib"],
 )
 
diff --git a/examples/crossbuild/MODULE.bazel b/examples/crossbuild/MODULE.bazel
@@ -22,7 +22,7 @@ scala_config.settings(
     scala_version = "3.3.7",
     scala_versions = [
         "2.11.12",
-        "2.13.17",
+        "2.13.18",
         "3.3.7",
     ],
 )
diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE
@@ -61,7 +61,7 @@ scala_config(
     scala_version = "3.3.7",
     scala_versions = [
         "2.11.12",
-        "2.13.17",
+        "2.13.18",
         "3.3.7",
     ],
 )
diff --git a/examples/semanticdb/MODULE.bazel b/examples/semanticdb/MODULE.bazel
@@ -19,7 +19,7 @@ scala_config = use_extension(
     "scala_config",
 )
 scala_config.settings(
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
 )
 
 scala_deps = use_extension(
diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE
@@ -57,7 +57,7 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains")
 
 load("@rules_scala//:scala_config.bzl", "scala_config")
 
-scala_config(scala_version = "2.13.17")
+scala_config(scala_version = "2.13.18")
 
 load(
     "@rules_scala//scala:toolchains.bzl",
diff --git a/scala/private/macros/compiler_sources_integrity.bzl b/scala/private/macros/compiler_sources_integrity.bzl
@@ -165,6 +165,10 @@ COMPILER_SOURCES = {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.17/scala-compiler-2.13.17-sources.jar",
         "integrity": "sha256-57ReeT2ywMUwFb/nCOLr2C2vMTGCZv+1IH51Qp5xHuU=",
     },
+    "2.13.18": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.18/scala-compiler-2.13.18-sources.jar",
+        "integrity": "sha256-CNmYSw6MVTvf17X6aqjB0vLxzWkEOZuaCrjro0Xe0zU=",
+    },
     "3.1.0": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.1.0/scala3-compiler_3-3.1.0-sources.jar",
         "integrity": "sha256-tULCgB/phMLaHCKNZIeAHWZy/4LXhx9ghylO6FL5qlw=",
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.17, 3.1.3, 3.2.2,
+                        versions: 2.11.12, 2.12.20, 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
@@ -17,7 +17,7 @@
 ROOT_SCALA_VERSIONS = [
     "2.11.12",
     "2.12.20",
-    "2.13.17",
+    "2.13.18",
     "3.1.3",
     "3.2.2",
     "3.3.7", # LTS
diff --git a/scripts/update_compiler_sources_integrity.py b/scripts/update_compiler_sources_integrity.py
@@ -23,7 +23,7 @@
 ] + [
     f'2.12.{patch}' for patch in range(1, 21)  # 2.12.1 to 2.12.20
 ] + [
-    f'2.13.{patch}' for patch in range(0, 18)  # 2.13.0 to 2.13.17
+    f'2.13.{patch}' for patch in range(0, 19)  # 2.13.0 to 2.13.18
 ] + [
     f'3.1.{patch}' for patch in range(0, 4)    # 3.1.0  to 3.1.3
 ] + [
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.17 3.3.7; do
+for scalaVersion in 2.12.20 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
@@ -12,7 +12,7 @@ test_classpath_contains_2_12() {
 
 test_classpath_contains_2_13() {
   bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
-   --repo_env=SCALA_VERSION=2.13.17 \
+   --repo_env=SCALA_VERSION=2.13.18 \
    | grep scala-library-2.13
 }
 
diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel
@@ -23,7 +23,7 @@ scala_config.settings(
     scala_versions = [
         "2.11.12",
         "2.12.20",
-        "2.13.17",
+        "2.13.18",
         "3.1.3",
         "3.2.2",
         "3.3.7",
diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE
@@ -62,7 +62,7 @@ scala_config(
     scala_versions = [
         "2.11.12",
         "2.12.20",
-        "2.13.17",
+        "2.13.18",
         "3.1.3",
         "3.2.2",
         "3.3.7",
diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD
@@ -20,15 +20,15 @@ scalafmt_scala_library(
     srcs = ["unformatted/unformatted-library2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
 )
 
 scalafmt_scala_library(
     name = "formatted-library2",
     srcs = ["formatted/formatted-library2.scala"],
     config = ":scala2-conf",
     format = True,
-    scala_version = "2.13.17",
+    scala_version = "2.13.18",
 )
 
 scalafmt_scala_library(
diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh
@@ -18,7 +18,7 @@ runner=$(get_test_runner "${1:-local}")
 $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.17"
+$runner test_scala_version "2.13.18"
 $runner test_scala_version "2.12.20"
 
 # Tests for other versions should be placed in dangerous_test_thirdparty_version.sh 
diff --git a/test_version.sh b/test_version.sh
@@ -3,7 +3,7 @@
 set -e
 
 scala_2_12_version="2.12.20"
-scala_2_13_version="2.13.17"
+scala_2_13_version="2.13.18"
 scala_3_version="3.3.7"
 
 SCALA_VERSION_DEFAULT=$scala_2_12_version
diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl
@@ -3,7 +3,7 @@
 Mostly generated and updated by scripts/create_repository.py.
 """
 
-scala_version = "2.13.17"
+scala_version = "2.13.18"
 
 artifacts = {
     "com_github_jnr_jffi_native": {
@@ -186,8 +186,8 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_compiler": {
-        "artifact": "org.scala-lang:scala-compiler:2.13.17",
-        "sha256": "073ab364dc902519719bd6b9463562128abc5881d2a2e4b7a5e2d04cdd7bc025",
+        "artifact": "org.scala-lang:scala-compiler:2.13.18",
+        "sha256": "2f15891fcae7aad30a3892194fb2abb6224cf7ce5d2bd90fba7f1c48682fca21",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
             "@io_bazel_rules_scala_scala_reflect",
@@ -445,8 +445,8 @@ artifacts = {
         ],
     },
     "org_scala_lang_scalap": {
-        "artifact": "org.scala-lang:scalap:2.13.17",
-        "sha256": "ff41633c298d3c1c35f1e31ca5284e25115a094ed9682cdd71ced6a5d04a5165",
+        "artifact": "org.scala-lang:scalap:2.13.18",
+        "sha256": "278216a595f34d0cfb78ae710cb487f31d468fa5e883ffae8af0947b6f67c517",
         "deps": [
             "@io_bazel_rules_scala_scala_compiler",
         ],
@@ -572,8 +572,8 @@ artifacts = {
         ],
     },
     "org_scalameta_semanticdb_scalac": {
-        "artifact": "org.scalameta:semanticdb-scalac_2.13.17:4.13.10",
-        "sha256": "88a32438e933f3e23432bf8059d740f6fa3f11e7ba8c19474eb1f795d9c2fe3a",
+        "artifact": "org.scalameta:semanticdb-scalac_2.13.18:4.13.10",
+        "sha256": "d10285e2c958b75804a2a327e0e69eec3727ac883d37a6e1fa15d17ec2e44d39",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
         ],
@@ -606,7 +606,7 @@ artifacts = {
         "sha256": "6058d02418e4eb5f1919a1156d63d2d1b93f2c6190b1a1806ee2b73f8726a92f",
     },
     "org_typelevel_kind_projector": {
-        "artifact": "org.typelevel:kind-projector_2.13.17:0.13.4",
+        "artifact": "org.typelevel:kind-projector_2.13.18:0.13.4",
         "sha256": "e4bac237aae1a530cc5c7f0c98723a2f9e4890b8ef02a8d0aa2afa8c79dce6c0",
         "deps": [
             "@io_bazel_rules_scala_scala_compiler",
diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl
@@ -197,8 +197,8 @@ artifacts = {
         ],
     },
     "io_bazel_rules_scala_scala_compiler_2": {
-        "artifact": "org.scala-lang:scala-compiler:2.13.17",
-        "sha256": "073ab364dc902519719bd6b9463562128abc5881d2a2e4b7a5e2d04cdd7bc025",
+        "artifact": "org.scala-lang:scala-compiler:2.13.18",
+        "sha256": "2f15891fcae7aad30a3892194fb2abb6224cf7ce5d2bd90fba7f1c48682fca21",
         "deps": [
             "@io_bazel_rules_scala_scala_library_2",
             "@io_bazel_rules_scala_scala_reflect_2",
@@ -490,8 +490,8 @@ artifacts = {
         ],
     },
     "org_scala_lang_scalap": {
-        "artifact": "org.scala-lang:scalap:2.13.17",
-        "sha256": "ff41633c298d3c1c35f1e31ca5284e25115a094ed9682cdd71ced6a5d04a5165",
+        "artifact": "org.scala-lang:scalap:2.13.18",
+        "sha256": "278216a595f34d0cfb78ae710cb487f31d468fa5e883ffae8af0947b6f67c517",
         "deps": [
             "@io_bazel_rules_scala_scala_compiler_2",
         ],
diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl
diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl
diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl
diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl
diff --git a/third_party/repositories/scala_3_6.bzl b/third_party/repositories/scala_3_6.bzl
diff --git a/third_party/repositories/scala_3_7.bzl b/third_party/repositories/scala_3_7.bzl
diff --git a/third_party/repositories/scala_3_8.bzl b/third_party/repositories/scala_3_8.bzl

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ SCALA_VERSION = "2.12.20"`
`17`	`17`	`SCALA_2_VERSIONS = [`
`18`	`18`	`"2.11.12",`
`19`	`19`	`"2.12.20",`
`20`		`- "2.13.17",`
	`20`	`+ "2.13.18",`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`SCALA_3_VERSIONS = [`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ scala_library(`
`14`	`14`	`scala_test(`
`15`	`15`	`name = "test213",`
`16`	`16`	`srcs = ["test.scala"],`
`17`		`- scala_version = "2.13.17",`
	`17`	`+ scala_version = "2.13.18",`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`# This one will be compiled by 3.3 compiler (the default one):`