Skip to content

Commit f30237b

Browse files
WojciechMazurWojciechMazur
authored
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(

‎test_cross_build/version_specific/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
77
scala_library(
88
name = "since_3_3",
99
srcs = ["since_3_3.scala"],
10-
scala_version = "3.3.4",
10+
scala_version = "3.3.5",
1111
)
1212

1313
scala_library(
@@ -43,7 +43,7 @@ scala_library(
4343
"since_3_2.scala",
4444
"since_3_3.scala",
4545
],
46-
scala_version = "3.3.4",
46+
scala_version = "3.3.5",
4747
)
4848

4949
scala_library(

‎test_thirdparty_version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runner=$(get_test_runner "${1:-local}")
1616

1717
# Latest version of each major version
1818
$runner test_scala_version "3.6.3" # Latest Next version
19-
$runner test_scala_version "3.3.4" # Latest LTS version
19+
$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
2121
$runner test_scala_version "2.13.15"
2222
$runner test_scala_version "2.12.20"

‎test_version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
scala_2_11_version="2.11.12"
66
scala_2_12_version="2.12.20"
77
scala_2_13_version="2.13.15"
8-
scala_3_version="3.3.4"
8+
scala_3_version="3.3.5"
99

1010
SCALA_VERSION_DEFAULT=$scala_2_11_version
1111

‎third_party/repositories/scala_3_3.bzl

Lines changed: 20 additions & 11 deletions
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 = "3.3.4"
6+
scala_version = "3.3.5"
77

88
artifacts = {
99
"com_geirsson_metaconfig_core": {
@@ -217,14 +217,20 @@ artifacts = {
217217
],
218218
},
219219
"io_bazel_rules_scala_scala_asm": {
220-
"artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1",
221-
"sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12",
220+
"artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
221+
"sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
222222
},
223223
"io_bazel_rules_scala_scala_compiler": {
224-
"artifact": "org.scala-lang:scala3-compiler_3:3.3.4",
225-
"sha256": "2cca65fdb92e2cc393786cae61b4f7bcb9032ad4be61f9cebae1dca72997e52f",
224+
"artifact": "org.scala-lang:scala3-compiler_3:3.3.5",
225+
"sha256": "f067da9a52ec450efa5d1cc1a3325b7f9882874a059b11728969460d170ed424",
226226
"deps": [
227227
"@io_bazel_rules_scala_scala_asm",
228+
"@io_bazel_rules_scala_scala_interfaces",
229+
"@io_bazel_rules_scala_scala_library",
230+
"@io_bazel_rules_scala_scala_tasty_core",
231+
"@org_jline_jline_reader",
232+
"@org_jline_jline_terminal",
233+
"@org_jline_jline_terminal_jni",
228234
"@org_scala_sbt_compiler_interface",
229235
],
230236
},
@@ -233,12 +239,12 @@ artifacts = {
233239
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
234240
},
235241
"io_bazel_rules_scala_scala_interfaces": {
236-
"artifact": "org.scala-lang:scala3-interfaces:3.3.4",
237-
"sha256": "fe056c10a217353e14aa62076d2bbd957ebd82e02fb445ca5546ae8ea9d40caa",
242+
"artifact": "org.scala-lang:scala3-interfaces:3.3.5",
243+
"sha256": "b44fcdf2d4aef100ab2a24f88b5432b3f487de91ab38f54c8e0b96cb35913c93",
238244
},
239245
"io_bazel_rules_scala_scala_library": {
240-
"artifact": "org.scala-lang:scala3-library_3:3.3.4",
241-
"sha256": "d95184acfcd814da2e051378e4962c653f4b468f4086452ab427af030482bd3c",
246+
"artifact": "org.scala-lang:scala3-library_3:3.3.5",
247+
"sha256": "26163f54674adb4c3e2151155f7f6f17095a0be10ebfb884ee8cdca98adca248",
242248
"deps": [
243249
"@io_bazel_rules_scala_scala_library_2",
244250
],
@@ -269,8 +275,11 @@ artifacts = {
269275
],
270276
},
271277
"io_bazel_rules_scala_scala_tasty_core": {
272-
"artifact": "org.scala-lang:tasty-core_3:3.3.4",
273-
"sha256": "13d44693d6f2d38e0595954d11234c0373d6d0e689a8151b06878c5b631d57d5",
278+
"artifact": "org.scala-lang:tasty-core_3:3.3.5",
279+
"sha256": "7e14a81eaebe0c23ac5350e5421691d46206a46ce88493450ec625ef47498922",
280+
"deps": [
281+
"@io_bazel_rules_scala_scala_library",
282+
],
274283
},
275284
"io_bazel_rules_scala_scala_xml": {
276285
"artifact": "org.scala-lang.modules:scala-xml_3:2.1.0",

0 commit comments

Comments
 (0)