Skip to content

Commit f30237b

Browse files
Upgrade Scala 3 LTS to 3.3.5 (#1689)
1 parent 870d952 commit f30237b

File tree

14 files changed

+38
-29
lines changed

14 files changed

+38
-29
lines changed

dt_patches/dt_patch_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ run_test_local test_compiler_patch 2.13.15
119119
run_test_local test_compiler_patch 3.1.0 # Minimal supported version
120120
run_test_local test_compiler_patch 3.1.3
121121
run_test_local test_compiler_patch 3.2.2
122-
run_test_local test_compiler_patch 3.3.4
122+
run_test_local test_compiler_patch 3.3.5
123123
run_test_local test_compiler_patch 3.4.3
124124
run_test_local test_compiler_patch 3.5.2
125125
run_test_local test_compiler_patch 3.6.2
@@ -151,7 +151,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.15
151151

152152
run_test_local test_compiler_srcjar 3.1.3
153153
run_test_local test_compiler_srcjar 3.2.2
154-
run_test_local test_compiler_srcjar_nonhermetic 3.3.4
154+
run_test_local test_compiler_srcjar_nonhermetic 3.3.5
155155
run_test_local test_compiler_srcjar 3.4.3
156156
run_test_local test_compiler_srcjar_nonhermetic 3.5.2
157157
run_test_local test_compiler_srcjar_nonhermetic 3.6.2

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ srcjars_by_version = {
120120
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.2.2/scala3-compiler_3-3.2.2-sources.jar",
121121
"sha256": "669d580fc4a8d3c2e2d13d5735ae9be05d567613fe44482de5bcc5e2e2ee89ea",
122122
},
123-
"3.3.4": {
124-
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.4/scala3-compiler_3-3.3.4-sources.jar",
123+
"3.3.5": {
124+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.5/scala3-compiler_3-3.3.5-sources.jar",
125125
},
126126
"3.4.3": {
127127
"label": "@scala3_compiler_srcjar//jar:downloaded.jar",

examples/crossbuild/3_select/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ scala_binary(
3030
name = "bin3",
3131
srcs = ["bin.scala"],
3232
main_class = "B",
33-
scala_version = "3.3.4",
33+
scala_version = "3.3.5",
3434
deps = [":lib"],
3535
)

examples/crossbuild/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ rules_proto_toolchains()
5151
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
5252

5353
scala_config(
54-
scala_version = "3.3.4",
54+
scala_version = "3.3.5",
5555
scala_versions = [
5656
"2.11.12",
5757
"2.13.15",
58-
"3.3.4",
58+
"3.3.5",
5959
],
6060
)
6161

scripts/create_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"2.13.15",
2121
"3.1.3",
2222
"3.2.2",
23-
"3.3.4",
23+
"3.3.5",
2424
"3.4.3",
2525
"3.5.2",
2626
"3.6.3"

test/shell/test_examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function scala3_2_example() {
3838
}
3939

4040
function scala3_3_example() {
41-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.4 //..."
41+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.5 //..."
4242
}
4343

4444
function scala3_4_example() {

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.4; do
28+
for scalaVersion in 2.12.20 2.13.15 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_semanticdb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test_produces_semanticdb(){
3030
fi
3131

3232
if [ $scala_majver -eq 3 ]; then
33-
local version_opt="--repo_env=SCALA_VERSION=3.3.4"
33+
local version_opt="--repo_env=SCALA_VERSION=3.3.5"
3434
fi
3535

3636

test_cross_build/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ scala_config(
5858
"2.13.15",
5959
"3.1.3",
6060
"3.2.2",
61-
"3.3.4",
61+
"3.3.5",
6262
],
6363
)
6464

test_cross_build/scalafmt/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ scalafmt_scala_library(
3636
srcs = ["unformatted/unformatted-library3.scala"],
3737
config = ":scala3-conf",
3838
format = True,
39-
scala_version = "3.3.4",
39+
scala_version = "3.3.5",
4040
)
4141

4242
scalafmt_scala_library(
4343
name = "formatted-library3",
4444
srcs = ["formatted/formatted-library3.scala"],
4545
config = ":scala3-conf",
4646
format = True,
47-
scala_version = "3.3.4",
47+
scala_version = "3.3.5",
4848
)
4949

5050
scalafmt_scala_binary(

0 commit comments

Comments
 (0)