Skip to content

Commit 2e59e88

Browse files
bartoszkosiorekbartoszkosiorek
authored
Upgrade Scala 2.13 LTS to 2.13.16 (#1700)
Fixes: #1699
1 parent 58dfbc7 commit 2e59e88

File tree

22 files changed

+98
-67
lines changed

22 files changed

+98
-67
lines changed

‎README.md

+2-2
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

+2
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

+3
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rules_proto_toolchains()
5050

5151
load("@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(
5656
"@rules_scala//scala:toolchains.bzl",

‎scripts/create_repository.py

+1-1
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

+1-1
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

‎test/shell/test_scala_config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_classpath_contains_2_12() {
1212

1313
test_classpath_contains_2_13() {
1414
bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \
15-
--repo_env=SCALA_VERSION=2.13.15 \
15+
--repo_env=SCALA_VERSION=2.13.16 \
1616
| grep scala-library-2.13
1717
}
1818

‎test_cross_build/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ scala_config(
5555
scala_versions = [
5656
"2.11.12",
5757
"2.12.20",
58-
"2.13.15",
58+
"2.13.16",
5959
"3.1.3",
6060
"3.2.2",
6161
"3.3.5",

‎test_cross_build/scalafmt/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ scalafmt_scala_library(
2020
srcs = ["unformatted/unformatted-library2.scala"],
2121
config = ":scala2-conf",
2222
format = True,
23-
scala_version = "2.13.15",
23+
scala_version = "2.13.16",
2424
)
2525

2626
scalafmt_scala_library(
2727
name = "formatted-library2",
2828
srcs = ["formatted/formatted-library2.scala"],
2929
config = ":scala2-conf",
3030
format = True,
31-
scala_version = "2.13.15",
31+
scala_version = "2.13.16",
3232
)
3333

3434
scalafmt_scala_library(

‎test_thirdparty_version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runner=$(get_test_runner "${1:-local}")
1818
$runner test_scala_version "3.6.3" # Latest Next version
1919
$runner test_scala_version "3.3.5" # Latest LTS version
2020
$runner test_scala_version "3.1.3" # First supported major for Scala 3, max supported JDK=18
21-
$runner test_scala_version "2.13.15"
21+
$runner test_scala_version "2.13.16"
2222
$runner test_scala_version "2.12.20"
2323
$runner test_scala_version "2.11.12"
2424

‎test_version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
scala_2_11_version="2.11.12"
66
scala_2_12_version="2.12.20"
7-
scala_2_13_version="2.13.15"
7+
scala_2_13_version="2.13.16"
88
scala_3_version="3.3.5"
99

1010
SCALA_VERSION_DEFAULT=$scala_2_11_version

‎third_party/repositories/scala_2_13.bzl

+12-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Mostly generated and updated by scripts/create_repository.py.
44
"""
55

6-
scala_version = "2.13.15"
6+
scala_version = "2.13.16"
77

88
artifacts = {
99
"com_github_jnr_jffi_native": {
@@ -184,11 +184,13 @@ artifacts = {
184184
],
185185
},
186186
"io_bazel_rules_scala_scala_compiler": {
187-
"artifact": "org.scala-lang:scala-compiler:2.13.15",
188-
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
187+
"artifact": "org.scala-lang:scala-compiler:2.13.16",
188+
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
189189
"deps": [
190190
"@io_bazel_rules_scala_scala_library",
191191
"@io_bazel_rules_scala_scala_reflect",
192+
"@io_github_java_diff_utils_java_diff_utils",
193+
"@org_jline_jline",
192194
],
193195
},
194196
"io_bazel_rules_scala_scala_library": {
@@ -401,8 +403,8 @@ artifacts = {
401403
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
402404
},
403405
"io_github_java_diff_utils_java_diff_utils": {
404-
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
405-
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
406+
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
407+
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
406408
},
407409
"libthrift": {
408410
"artifact": "org.apache.thrift:libthrift:0.8.0",
@@ -437,8 +439,8 @@ artifacts = {
437439
],
438440
},
439441
"org_scala_lang_scalap": {
440-
"artifact": "org.scala-lang:scalap:2.13.15",
441-
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
442+
"artifact": "org.scala-lang:scalap:2.13.16",
443+
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
442444
"deps": [
443445
"@io_bazel_rules_scala_scala_compiler",
444446
],
@@ -558,8 +560,8 @@ artifacts = {
558560
],
559561
},
560562
"org_scalameta_semanticdb_scalac": {
561-
"artifact": "org.scalameta:semanticdb-scalac_2.13.15:4.9.9",
562-
"sha256": "409194fee7eeb3da25733f6fc0c2d62b9ef53ddecdc50b6c922fdc695b250fe7",
563+
"artifact": "org.scalameta:semanticdb-scalac_2.13.16:4.9.9",
564+
"sha256": "24e2c6e7aeb19656ef6b60e93d2eab886c9a7c530bf3117880b45fcb526addd7",
563565
"deps": [
564566
"@io_bazel_rules_scala_scala_library",
565567
],
@@ -591,7 +593,7 @@ artifacts = {
591593
"sha256": "6058d02418e4eb5f1919a1156d63d2d1b93f2c6190b1a1806ee2b73f8726a92f",
592594
},
593595
"org_typelevel_kind_projector": {
594-
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
596+
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
595597
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
596598
"deps": [
597599
"@io_bazel_rules_scala_scala_compiler",

‎third_party/repositories/scala_3_1.bzl

+7-7
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ artifacts = {
198198
],
199199
},
200200
"io_bazel_rules_scala_scala_compiler_2": {
201-
"artifact": "org.scala-lang:scala-compiler:2.13.15",
202-
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
201+
"artifact": "org.scala-lang:scala-compiler:2.13.16",
202+
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
203203
},
204204
"io_bazel_rules_scala_scala_interfaces": {
205205
"artifact": "org.scala-lang:scala3-interfaces:3.1.3",
@@ -411,8 +411,8 @@ artifacts = {
411411
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
412412
},
413413
"io_github_java_diff_utils_java_diff_utils": {
414-
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
415-
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
414+
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
415+
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
416416
},
417417
"libthrift": {
418418
"artifact": "org.apache.thrift:libthrift:0.8.0",
@@ -481,8 +481,8 @@ artifacts = {
481481
],
482482
},
483483
"org_scala_lang_scalap": {
484-
"artifact": "org.scala-lang:scalap:2.13.15",
485-
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
484+
"artifact": "org.scala-lang:scalap:2.13.16",
485+
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
486486
"deps": [
487487
"@io_bazel_rules_scala_scala_compiler_2",
488488
],
@@ -639,7 +639,7 @@ artifacts = {
639639
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
640640
},
641641
"org_typelevel_kind_projector": {
642-
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
642+
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
643643
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
644644
"deps": [
645645
"@io_bazel_rules_scala_scala_compiler_2",

‎third_party/repositories/scala_3_2.bzl

+7-7
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ artifacts = {
198198
],
199199
},
200200
"io_bazel_rules_scala_scala_compiler_2": {
201-
"artifact": "org.scala-lang:scala-compiler:2.13.15",
202-
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
201+
"artifact": "org.scala-lang:scala-compiler:2.13.16",
202+
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
203203
},
204204
"io_bazel_rules_scala_scala_interfaces": {
205205
"artifact": "org.scala-lang:scala3-interfaces:3.2.2",
@@ -411,8 +411,8 @@ artifacts = {
411411
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
412412
},
413413
"io_github_java_diff_utils_java_diff_utils": {
414-
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
415-
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
414+
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
415+
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
416416
},
417417
"libthrift": {
418418
"artifact": "org.apache.thrift:libthrift:0.8.0",
@@ -481,8 +481,8 @@ artifacts = {
481481
],
482482
},
483483
"org_scala_lang_scalap": {
484-
"artifact": "org.scala-lang:scalap:2.13.15",
485-
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
484+
"artifact": "org.scala-lang:scalap:2.13.16",
485+
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
486486
"deps": [
487487
"@io_bazel_rules_scala_scala_compiler_2",
488488
],
@@ -639,7 +639,7 @@ artifacts = {
639639
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
640640
},
641641
"org_typelevel_kind_projector": {
642-
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
642+
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
643643
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
644644
"deps": [
645645
"@io_bazel_rules_scala_scala_compiler_2",

‎third_party/repositories/scala_3_3.bzl

+13-7
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,14 @@ artifacts = {
205205
],
206206
},
207207
"io_bazel_rules_scala_scala_compiler_2": {
208-
"artifact": "org.scala-lang:scala-compiler:2.13.15",
209-
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
208+
"artifact": "org.scala-lang:scala-compiler:2.13.16",
209+
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
210+
"deps": [
211+
"@io_bazel_rules_scala_scala_library_2",
212+
"@io_bazel_rules_scala_scala_reflect_2",
213+
"@io_github_java_diff_utils_java_diff_utils",
214+
"@org_jline_jline",
215+
],
210216
},
211217
"io_bazel_rules_scala_scala_interfaces": {
212218
"artifact": "org.scala-lang:scala3-interfaces:3.3.5",
@@ -421,8 +427,8 @@ artifacts = {
421427
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
422428
},
423429
"io_github_java_diff_utils_java_diff_utils": {
424-
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
425-
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
430+
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
431+
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
426432
},
427433
"libthrift": {
428434
"artifact": "org.apache.thrift:libthrift:0.8.0",
@@ -491,8 +497,8 @@ artifacts = {
491497
],
492498
},
493499
"org_scala_lang_scalap": {
494-
"artifact": "org.scala-lang:scalap:2.13.15",
495-
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
500+
"artifact": "org.scala-lang:scalap:2.13.16",
501+
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
496502
"deps": [
497503
"@io_bazel_rules_scala_scala_compiler_2",
498504
],
@@ -649,7 +655,7 @@ artifacts = {
649655
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
650656
},
651657
"org_typelevel_kind_projector": {
652-
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
658+
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
653659
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
654660
"deps": [
655661
"@io_bazel_rules_scala_scala_compiler_2",

0 commit comments

Comments
 (0)