Skip to content

Commit 526cc82

Browse files
Upgrade Scala 2.13 LTS to 2.13.16
Fixes: #1699
1 parent d9e6b1a commit 526cc82

File tree

22 files changed

+98
-67
lines changed

22 files changed

+98
-67
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis.
143143
To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure
144144
dependencies by declaring [scala_toolchain](docs/scala_toolchain.md).
145145
For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have
146-
dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions.
146+
dependency providers configured for `2.11.12`, `2.12.20` and `2.13.16` versions.
147147

148148

149149
```starlark
150150
# WORKSPACE
151151
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
152-
scala_config(scala_version = "2.13.15")
152+
scala_config(scala_version = "2.13.16")
153153

154154
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
155155
rules_proto_dependencies()

dt_patches/dt_patch_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ run_test_local test_compiler_patch 2.13.11
115115
run_test_local test_compiler_patch 2.13.12
116116
run_test_local test_compiler_patch 2.13.14
117117
run_test_local test_compiler_patch 2.13.15
118+
run_test_local test_compiler_patch 2.13.16
118119

119120
run_test_local test_compiler_patch 3.1.0 # Minimal supported version
120121
run_test_local test_compiler_patch 3.1.3
@@ -148,6 +149,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.11
148149
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
149150
run_test_local test_compiler_srcjar_nonhermetic 2.13.14
150151
run_test_local test_compiler_srcjar_nonhermetic 2.13.15
152+
run_test_local test_compiler_srcjar_nonhermetic 2.13.16
151153

152154
run_test_local test_compiler_srcjar 3.1.3
153155
run_test_local test_compiler_srcjar 3.2.2

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ srcjars_by_version = {
112112
"2.13.15": {
113113
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15-sources.jar?foo",
114114
},
115+
"2.13.16": {
116+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.16/scala-compiler-2.13.16-sources.jar?foo",
117+
},
115118
"3.1.3": {
116119
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.1.3/scala3-compiler_3-3.1.3-sources.jar",
117120
"integrity": "sha384-4J2ihR1QSdP5cvL3y2OUfw4uUX/hsQqcPlJV+IrQdsM/soiIAYfoEeIEt6vl3xBk",

examples/crossbuild/1_single/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scala_library(
1414
scala_test(
1515
name = "test213",
1616
srcs = ["test.scala"],
17-
scala_version = "2.13.15",
17+
scala_version = "2.13.16",
1818
)
1919

2020
# This one will be compiled by 3.3 compiler (the default one):

examples/crossbuild/2_deps/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ scala_binary(
1919
name = "bin213",
2020
srcs = ["bin.scala"], # compiled with 2.13 (as per `scala_version`)
2121
main_class = "C",
22-
scala_version = "2.13.15",
22+
scala_version = "2.13.16",
2323
deps = [
2424
":lib", # compiled 2.13 (as per `scala_version`)
2525
":lib211", # compiled with 2.11 (that target overrides version)

examples/crossbuild/3_select/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ scala_binary(
2222
name = "bin2",
2323
srcs = ["bin.scala"],
2424
main_class = "B",
25-
scala_version = "2.13.15",
25+
scala_version = "2.13.16",
2626
deps = [":lib"],
2727
)
2828

examples/crossbuild/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ scala_config(
5454
scala_version = "3.3.5",
5555
scala_versions = [
5656
"2.11.12",
57-
"2.13.15",
57+
"2.13.16",
5858
"3.3.5",
5959
],
6060
)

examples/semanticdb/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rules_proto_toolchains()
5050

5151
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
5252

53-
scala_config(scala_version = "2.13.15")
53+
scala_config(scala_version = "2.13.16")
5454

5555
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
5656

scripts/create_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ROOT_SCALA_VERSIONS = [
1818
"2.11.12",
1919
"2.12.20",
20-
"2.13.15",
20+
"2.13.16",
2121
"3.1.3",
2222
"3.2.2",
2323
"3.3.5",

test/shell/test_invalid_scalacopts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_logs_not_contains() {
2525
2>&1 | grep -v "$expected"
2626
}
2727

28-
for scalaVersion in 2.12.20 2.13.15 3.3.5; do
28+
for scalaVersion in 2.12.20 2.13.16 3.3.5; do
2929
if [[ "$scalaVersion" == 3.* ]]; then
3030
$runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source"
3131
else

0 commit comments

Comments
 (0)