Skip to content

Upgrade Scala 2.13 LTS to 2.13.16 #1700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged

Upgrade Scala 2.13 LTS to 2.13.16 #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis.
To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure
dependencies by declaring [scala_toolchain](docs/scala_toolchain.md).
For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have
dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions.
dependency providers configured for `2.11.12`, `2.12.20` and `2.13.16` versions.


```starlark
# WORKSPACE
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = "2.13.15")
scala_config(scala_version = "2.13.16")

load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
rules_proto_dependencies()
Expand Down
2 changes: 2 additions & 0 deletions dt_patches/dt_patch_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ run_test_local test_compiler_patch 2.13.11
run_test_local test_compiler_patch 2.13.12
run_test_local test_compiler_patch 2.13.14
run_test_local test_compiler_patch 2.13.15
run_test_local test_compiler_patch 2.13.16

run_test_local test_compiler_patch 3.1.0 # Minimal supported version
run_test_local test_compiler_patch 3.1.3
Expand Down Expand Up @@ -148,6 +149,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.11
run_test_local test_compiler_srcjar_nonhermetic 2.13.12
run_test_local test_compiler_srcjar_nonhermetic 2.13.14
run_test_local test_compiler_srcjar_nonhermetic 2.13.15
run_test_local test_compiler_srcjar_nonhermetic 2.13.16

run_test_local test_compiler_srcjar 3.1.3
run_test_local test_compiler_srcjar 3.2.2
Expand Down
3 changes: 3 additions & 0 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ srcjars_by_version = {
"2.13.15": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15-sources.jar?foo",
},
"2.13.16": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.16/scala-compiler-2.13.16-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",
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/1_single/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ scala_library(
scala_test(
name = "test213",
srcs = ["test.scala"],
scala_version = "2.13.15",
scala_version = "2.13.16",
)

# This one will be compiled by 3.3 compiler (the default one):
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/2_deps/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15",
scala_version = "2.13.16",
deps = [
":lib", # compiled 2.13 (as per `scala_version`)
":lib211", # compiled with 2.11 (that target overrides version)
Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/3_select/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ scala_binary(
name = "bin2",
srcs = ["bin.scala"],
main_class = "B",
scala_version = "2.13.15",
scala_version = "2.13.16",
deps = [":lib"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/crossbuild/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ scala_config(
scala_version = "3.3.5",
scala_versions = [
"2.11.12",
"2.13.15",
"2.13.16",
"3.3.5",
],
)
Expand Down
2 changes: 1 addition & 1 deletion examples/semanticdb/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rules_proto_toolchains()

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

scala_config(scala_version = "2.13.15")
scala_config(scala_version = "2.13.16")

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

Expand Down
2 changes: 1 addition & 1 deletion scripts/create_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
ROOT_SCALA_VERSIONS = [
"2.11.12",
"2.12.20",
"2.13.15",
"2.13.16",
"3.1.3",
"3.2.2",
"3.3.5",
Expand Down
2 changes: 1 addition & 1 deletion test/shell/test_invalid_scalacopts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test_logs_not_contains() {
2>&1 | grep -v "$expected"
}

for scalaVersion in 2.12.20 2.13.15 3.3.5; do
for scalaVersion in 2.12.20 2.13.16 3.3.5; do
if [[ "$scalaVersion" == 3.* ]]; then
$runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source"
else
Expand Down
2 changes: 1 addition & 1 deletion test/shell/test_scala_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15 \
--repo_env=SCALA_VERSION=2.13.16 \
| grep scala-library-2.13
}

Expand Down
2 changes: 1 addition & 1 deletion test_cross_build/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ scala_config(
scala_versions = [
"2.11.12",
"2.12.20",
"2.13.15",
"2.13.16",
"3.1.3",
"3.2.2",
"3.3.5",
Expand Down
4 changes: 2 additions & 2 deletions test_cross_build/scalafmt/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ scalafmt_scala_library(
srcs = ["unformatted/unformatted-library2.scala"],
config = ":scala2-conf",
format = True,
scala_version = "2.13.15",
scala_version = "2.13.16",
)

scalafmt_scala_library(
name = "formatted-library2",
srcs = ["formatted/formatted-library2.scala"],
config = ":scala2-conf",
format = True,
scala_version = "2.13.15",
scala_version = "2.13.16",
)

scalafmt_scala_library(
Expand Down
2 changes: 1 addition & 1 deletion test_thirdparty_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runner=$(get_test_runner "${1:-local}")
$runner test_scala_version "3.6.3" # Latest Next version
$runner test_scala_version "3.3.5" # 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"
$runner test_scala_version "2.13.16"
$runner test_scala_version "2.12.20"
$runner test_scala_version "2.11.12"

Expand Down
2 changes: 1 addition & 1 deletion test_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

scala_2_11_version="2.11.12"
scala_2_12_version="2.12.20"
scala_2_13_version="2.13.15"
scala_2_13_version="2.13.16"
scala_3_version="3.3.5"

SCALA_VERSION_DEFAULT=$scala_2_11_version
Expand Down
22 changes: 12 additions & 10 deletions third_party/repositories/scala_2_13.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Mostly generated and updated by scripts/create_repository.py.
"""

scala_version = "2.13.15"
scala_version = "2.13.16"

artifacts = {
"com_github_jnr_jffi_native": {
Expand Down Expand Up @@ -184,11 +184,13 @@ artifacts = {
],
},
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala-compiler:2.13.15",
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
"artifact": "org.scala-lang:scala-compiler:2.13.16",
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
"deps": [
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_reflect",
"@io_github_java_diff_utils_java_diff_utils",
"@org_jline_jline",
],
},
"io_bazel_rules_scala_scala_library": {
Expand Down Expand Up @@ -401,8 +403,8 @@ artifacts = {
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
},
"io_github_java_diff_utils_java_diff_utils": {
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
},
"libthrift": {
"artifact": "org.apache.thrift:libthrift:0.8.0",
Expand Down Expand Up @@ -437,8 +439,8 @@ artifacts = {
],
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.15",
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
"artifact": "org.scala-lang:scalap:2.13.16",
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
],
Expand Down Expand Up @@ -558,8 +560,8 @@ artifacts = {
],
},
"org_scalameta_semanticdb_scalac": {
"artifact": "org.scalameta:semanticdb-scalac_2.13.15:4.9.9",
"sha256": "409194fee7eeb3da25733f6fc0c2d62b9ef53ddecdc50b6c922fdc695b250fe7",
"artifact": "org.scalameta:semanticdb-scalac_2.13.16:4.9.9",
"sha256": "24e2c6e7aeb19656ef6b60e93d2eab886c9a7c530bf3117880b45fcb526addd7",
"deps": [
"@io_bazel_rules_scala_scala_library",
],
Expand Down Expand Up @@ -591,7 +593,7 @@ artifacts = {
"sha256": "6058d02418e4eb5f1919a1156d63d2d1b93f2c6190b1a1806ee2b73f8726a92f",
},
"org_typelevel_kind_projector": {
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
"deps": [
"@io_bazel_rules_scala_scala_compiler",
Expand Down
14 changes: 7 additions & 7 deletions third_party/repositories/scala_3_1.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ artifacts = {
],
},
"io_bazel_rules_scala_scala_compiler_2": {
"artifact": "org.scala-lang:scala-compiler:2.13.15",
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
"artifact": "org.scala-lang:scala-compiler:2.13.16",
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
},
"io_bazel_rules_scala_scala_interfaces": {
"artifact": "org.scala-lang:scala3-interfaces:3.1.3",
Expand Down Expand Up @@ -411,8 +411,8 @@ artifacts = {
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
},
"io_github_java_diff_utils_java_diff_utils": {
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
},
"libthrift": {
"artifact": "org.apache.thrift:libthrift:0.8.0",
Expand Down Expand Up @@ -481,8 +481,8 @@ artifacts = {
],
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.15",
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
"artifact": "org.scala-lang:scalap:2.13.16",
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
],
Expand Down Expand Up @@ -639,7 +639,7 @@ artifacts = {
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
},
"org_typelevel_kind_projector": {
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
Expand Down
14 changes: 7 additions & 7 deletions third_party/repositories/scala_3_2.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ artifacts = {
],
},
"io_bazel_rules_scala_scala_compiler_2": {
"artifact": "org.scala-lang:scala-compiler:2.13.15",
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
"artifact": "org.scala-lang:scala-compiler:2.13.16",
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
},
"io_bazel_rules_scala_scala_interfaces": {
"artifact": "org.scala-lang:scala3-interfaces:3.2.2",
Expand Down Expand Up @@ -411,8 +411,8 @@ artifacts = {
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
},
"io_github_java_diff_utils_java_diff_utils": {
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
},
"libthrift": {
"artifact": "org.apache.thrift:libthrift:0.8.0",
Expand Down Expand Up @@ -481,8 +481,8 @@ artifacts = {
],
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.15",
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
"artifact": "org.scala-lang:scalap:2.13.16",
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
],
Expand Down Expand Up @@ -639,7 +639,7 @@ artifacts = {
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
},
"org_typelevel_kind_projector": {
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
Expand Down
20 changes: 13 additions & 7 deletions third_party/repositories/scala_3_3.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,14 @@ artifacts = {
],
},
"io_bazel_rules_scala_scala_compiler_2": {
"artifact": "org.scala-lang:scala-compiler:2.13.15",
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
"artifact": "org.scala-lang:scala-compiler:2.13.16",
"sha256": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3",
"deps": [
"@io_bazel_rules_scala_scala_library_2",
"@io_bazel_rules_scala_scala_reflect_2",
"@io_github_java_diff_utils_java_diff_utils",
"@org_jline_jline",
],
},
"io_bazel_rules_scala_scala_interfaces": {
"artifact": "org.scala-lang:scala3-interfaces:3.3.5",
Expand Down Expand Up @@ -421,8 +427,8 @@ artifacts = {
"sha256": "90bd8318329907dcf7e161287473e27272b38ee6857e9d56ee8a1958608cc49d",
},
"io_github_java_diff_utils_java_diff_utils": {
"artifact": "io.github.java-diff-utils:java-diff-utils:4.12",
"sha256": "9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5",
"artifact": "io.github.java-diff-utils:java-diff-utils:4.15",
"sha256": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7",
},
"libthrift": {
"artifact": "org.apache.thrift:libthrift:0.8.0",
Expand Down Expand Up @@ -491,8 +497,8 @@ artifacts = {
],
},
"org_scala_lang_scalap": {
"artifact": "org.scala-lang:scalap:2.13.15",
"sha256": "78991282d73e9d20cbf187bab8549ce2ef940269409d47df2a71faaf9afc4616",
"artifact": "org.scala-lang:scalap:2.13.16",
"sha256": "7963c72c4c74d52278e42b0108ae8ae866d4d1c4579e20209a2f9617e6aacfca",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
],
Expand Down Expand Up @@ -649,7 +655,7 @@ artifacts = {
"sha256": "6f3e17cb666886b7f21998e981ebf45966fe951898f851437a518a93cab667bd",
},
"org_typelevel_kind_projector": {
"artifact": "org.typelevel:kind-projector_2.13.15:0.13.3",
"artifact": "org.typelevel:kind-projector_2.13.16:0.13.3",
"sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92",
"deps": [
"@io_bazel_rules_scala_scala_compiler_2",
Expand Down
Loading