Skip to content

Commit 615c716

Browse files
WojciechMazurWojciechMazur
authored
Upgrade Scala 3.3.5 -> 3.3.6 (#1735)
1 parent f2adbac commit 615c716

File tree

22 files changed

+41
-41
lines changed

22 files changed

+41
-41
lines changed

‎MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SCALA_2_VERSIONS = [
1919

2020
SCALA_3_VERSIONS = [
2121
"3.1.3",
22-
"3.3.5",
22+
"3.3.6",
2323
"3.5.2",
2424
"3.6.4",
2525
"3.7.0",

‎docs/cross-compilation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ scala_config.settings(
2929
"2.12.20",
3030
"3.1.3",
3131
"3.2.2",
32-
"3.3.5",
32+
"3.3.6",
3333
],
3434
)
3535
```
@@ -48,7 +48,7 @@ scala_config(
4848
"2.13.16",
4949
"3.1.3",
5050
"3.2.2",
51-
"3.3.5",
51+
"3.3.6",
5252
],
5353
)
5454
```
@@ -287,7 +287,7 @@ specific Scala version. See [test_cross_build/version_specific/BUILD](
287287
scala_library(
288288
name = "since_3_3",
289289
srcs = ["since_3_3.scala"],
290-
scala_version = "3.3.5",
290+
scala_version = "3.3.6",
291291
)
292292

293293
scala_library(

‎dt_patches/dt_patch_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ run_test_local test_compiler_patch 2.13.16
120120
run_test_local test_compiler_patch 3.1.0 # Minimal supported version
121121
run_test_local test_compiler_patch 3.1.3
122122
run_test_local test_compiler_patch 3.2.2
123-
run_test_local test_compiler_patch 3.3.5
123+
run_test_local test_compiler_patch 3.3.6
124124
run_test_local test_compiler_patch 3.4.3
125125
run_test_local test_compiler_patch 3.5.2
126126
run_test_local test_compiler_patch 3.6.4
@@ -153,7 +153,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.16
153153

154154
run_test_local test_compiler_srcjar 3.1.3
155155
run_test_local test_compiler_srcjar 3.2.2
156-
run_test_local test_compiler_srcjar_nonhermetic 3.3.5
156+
run_test_local test_compiler_srcjar_nonhermetic 3.3.6
157157
run_test_local test_compiler_srcjar 3.4.3
158158
run_test_local test_compiler_srcjar_nonhermetic 3.5.2
159159
run_test_local test_compiler_srcjar_nonhermetic 3.6.4

‎dt_patches/test_dt_patches_user_srcjar/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ scala_deps.compiler_srcjar(
155155
version = "3.2.2",
156156
)
157157
scala_deps.compiler_srcjar(
158-
url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.5/scala3-compiler_3-3.3.5-sources.jar",
159-
version = "3.3.5",
158+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.6/scala3-compiler_3-3.3.6-sources.jar",
159+
version = "3.3.6",
160160
)
161161
scala_deps.compiler_srcjar(
162162
label = "@scala3_compiler_srcjar//jar:downloaded.jar",

‎dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ srcjars_by_version = {
135135
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.2.2/scala3-compiler_3-3.2.2-sources.jar",
136136
"sha256": "669d580fc4a8d3c2e2d13d5735ae9be05d567613fe44482de5bcc5e2e2ee89ea",
137137
},
138-
"3.3.5": {
139-
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.5/scala3-compiler_3-3.3.5-sources.jar",
138+
"3.3.6": {
139+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.6/scala3-compiler_3-3.3.6-sources.jar",
140140
},
141141
"3.4.3": {
142142
"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.5",
33+
scala_version = "3.3.6",
3434
deps = [":lib"],
3535
)

‎examples/crossbuild/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ scala_config = use_extension(
1919
"scala_config",
2020
)
2121
scala_config.settings(
22-
scala_version = "3.3.5",
22+
scala_version = "3.3.6",
2323
scala_versions = [
2424
"2.11.12",
2525
"2.13.16",
26-
"3.3.5",
26+
"3.3.6",
2727
],
2828
)
2929
use_repo(scala_config, "rules_scala_config")

‎examples/crossbuild/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains")
6363
load("@rules_scala//:scala_config.bzl", "scala_config")
6464

6565
scala_config(
66-
scala_version = "3.3.5",
66+
scala_version = "3.3.6",
6767
scala_versions = [
6868
"2.11.12",
6969
"2.13.16",
70-
"3.3.5",
70+
"3.3.6",
7171
],
7272
)
7373

‎examples/overridden_artifacts/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ scala_config = use_extension(
1919
"scala_config",
2020
)
2121
scala_config.settings(
22-
scala_version = "3.3.5",
22+
scala_version = "3.3.6",
2323
)
2424

2525
scala_deps = use_extension(

‎examples/overridden_artifacts/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains")
6262

6363
load("@rules_scala//:scala_config.bzl", "scala_config")
6464

65-
scala_config(scala_version = "3.3.5")
65+
scala_config(scala_version = "3.3.6")
6666

6767
load(
6868
"@rules_scala//scala:toolchains.bzl",

‎scripts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ options:
5151
Scala version for which to update repository
5252
information; if not provided, updates all supported
5353
versions: 2.11.12, 2.12.20, 2.13.16, 3.1.3, 3.2.2,
54-
3.3.5, 3.4.3, 3.5.2, 3.6.4, 3.7.0
54+
3.3.6, 3.4.3, 3.5.2, 3.6.4, 3.7.0
5555
--output_dir OUTPUT_DIR
5656
Directory in which to generate or update repository
5757
files (default: .../third_party/repositories)

‎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.16",
2121
"3.1.3",
2222
"3.2.2",
23-
"3.3.5",
23+
"3.3.6", # LTS
2424
"3.4.3",
2525
"3.5.2",
2626
"3.6.4",

‎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.5 //..."
41+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.6 //..."
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.16 3.3.5; do
28+
for scalaVersion in 2.12.20 2.13.16 3.3.6; 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.5"
33+
local version_opt="--repo_env=SCALA_VERSION=3.3.6"
3434
fi
3535

3636

‎test_cross_build/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ scala_config.settings(
2626
"2.13.16",
2727
"3.1.3",
2828
"3.2.2",
29-
"3.3.5",
29+
"3.3.6",
3030
],
3131
)
3232
use_repo(scala_config, "rules_scala_config")

‎test_cross_build/WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ scala_config(
7070
"2.13.16",
7171
"3.1.3",
7272
"3.2.2",
73-
"3.3.5",
73+
"3.3.6",
7474
],
7575
)
7676

‎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.5",
39+
scala_version = "3.3.6",
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.5",
47+
scala_version = "3.3.6",
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("@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.5",
10+
scala_version = "3.3.6",
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.5",
46+
scala_version = "3.3.6",
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.7.0" # Latest Next version
19-
$runner test_scala_version "3.3.5" # Latest LTS version
19+
$runner test_scala_version "3.3.6" # 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.16"
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
@@ -4,7 +4,7 @@ set -e
44

55
scala_2_12_version="2.12.20"
66
scala_2_13_version="2.13.16"
7-
scala_3_version="3.3.5"
7+
scala_3_version="3.3.6"
88

99
SCALA_VERSION_DEFAULT=$scala_2_12_version
1010

‎third_party/repositories/scala_3_3.bzl

Lines changed: 11 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.5"
6+
scala_version = "3.3.6"
77

88
artifacts = {
99
"com_github_jnr_jffi_native": {
@@ -186,12 +186,12 @@ artifacts = {
186186
],
187187
},
188188
"io_bazel_rules_scala_scala_asm": {
189-
"artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
190-
"sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
189+
"artifact": "org.scala-lang.modules:scala-asm:9.8.0-scala-1",
190+
"sha256": "86af037580bdf9ce9c05f8b2afd734daf1a8564c38cd10ca5d08bf81508ad2e4",
191191
},
192192
"io_bazel_rules_scala_scala_compiler": {
193-
"artifact": "org.scala-lang:scala3-compiler_3:3.3.5",
194-
"sha256": "f067da9a52ec450efa5d1cc1a3325b7f9882874a059b11728969460d170ed424",
193+
"artifact": "org.scala-lang:scala3-compiler_3:3.3.6",
194+
"sha256": "3312960a654fd3421b1396378734ccb693bc0cbed21cca9e3974ad6f0c24191d",
195195
"deps": [
196196
"@io_bazel_rules_scala_scala_asm",
197197
"@io_bazel_rules_scala_scala_interfaces",
@@ -214,12 +214,12 @@ artifacts = {
214214
],
215215
},
216216
"io_bazel_rules_scala_scala_interfaces": {
217-
"artifact": "org.scala-lang:scala3-interfaces:3.3.5",
218-
"sha256": "b44fcdf2d4aef100ab2a24f88b5432b3f487de91ab38f54c8e0b96cb35913c93",
217+
"artifact": "org.scala-lang:scala3-interfaces:3.3.6",
218+
"sha256": "c118e77fec7721aac392bcff3afe6a7cae8311f6d327fadb001f8560521d647d",
219219
},
220220
"io_bazel_rules_scala_scala_library": {
221-
"artifact": "org.scala-lang:scala3-library_3:3.3.5",
222-
"sha256": "26163f54674adb4c3e2151155f7f6f17095a0be10ebfb884ee8cdca98adca248",
221+
"artifact": "org.scala-lang:scala3-library_3:3.3.6",
222+
"sha256": "cf4ddaf76c0ce71cf68ca5d2dc7bad46c5a921aaf18909317ddc9ba6e67fb12b",
223223
"deps": [
224224
"@io_bazel_rules_scala_scala_library_2",
225225
],
@@ -250,8 +250,8 @@ artifacts = {
250250
],
251251
},
252252
"io_bazel_rules_scala_scala_tasty_core": {
253-
"artifact": "org.scala-lang:tasty-core_3:3.3.5",
254-
"sha256": "7e14a81eaebe0c23ac5350e5421691d46206a46ce88493450ec625ef47498922",
253+
"artifact": "org.scala-lang:tasty-core_3:3.3.6",
254+
"sha256": "8618e08433fc306053040794587e12105fca4e8c9f096adb55823442a494329b",
255255
"deps": [
256256
"@io_bazel_rules_scala_scala_library",
257257
],

0 commit comments

Comments
 (0)