Skip to content

Commit 1c2a792

Browse files
Upgrade Scala 3.6 to 3.6.4 (#1715)
1 parent 4947f9d commit 1c2a792

File tree

8 files changed

+20
-24
lines changed

8 files changed

+20
-24
lines changed

dt_patches/dt_patch_test.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ run_test_local test_compiler_patch 3.2.2
123123
run_test_local test_compiler_patch 3.3.5
124124
run_test_local test_compiler_patch 3.4.3
125125
run_test_local test_compiler_patch 3.5.2
126-
run_test_local test_compiler_patch 3.6.2
127-
run_test_local test_compiler_patch 3.6.3
126+
run_test_local test_compiler_patch 3.6.4
128127

129128
run_test_local test_compiler_srcjar_error 2.12.11
130129
run_test_local test_compiler_srcjar_error 2.12.12
@@ -156,4 +155,4 @@ run_test_local test_compiler_srcjar 3.2.2
156155
run_test_local test_compiler_srcjar_nonhermetic 3.3.5
157156
run_test_local test_compiler_srcjar 3.4.3
158157
run_test_local test_compiler_srcjar_nonhermetic 3.5.2
159-
run_test_local test_compiler_srcjar_nonhermetic 3.6.2
158+
run_test_local test_compiler_srcjar_nonhermetic 3.6.4

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+2-5
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,8 @@ srcjars_by_version = {
132132
"3.5.2": {
133133
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.5.2/scala3-compiler_3-3.5.2-sources.jar",
134134
},
135-
"3.6.2": {
136-
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.2/scala3-compiler_3-3.6.2-sources.jar",
137-
},
138-
"3.6.3": {
139-
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.3/scala3-compiler_3-3.6.3-sources.jar",
135+
"3.6.4": {
136+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.4/scala3-compiler_3-3.6.4-sources.jar",
140137
},
141138
}
142139

examples/scala3/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 = "3.6.3")
53+
scala_config(scala_version = "3.6.4")
5454

5555
load(
5656
"@rules_scala//scala:toolchains.bzl",

scripts/README.md

+1-1
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.3
54+
3.3.5, 3.4.3, 3.5.2, 3.6.4
5555
--output_dir OUTPUT_DIR
5656
Directory in which to generate or update repository
5757
files (default: .../third_party/repositories)

scripts/create_repository.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"3.3.5",
2424
"3.4.3",
2525
"3.5.2",
26-
"3.6.3"
26+
"3.6.4"
2727
]
2828
PARSER_COMBINATORS_VERSION = '1.1.2'
2929
SBT_COMPILER_INTERFACE_VERSION = '1.10.7'

test/shell/test_examples.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function scala3_5_example() {
5050
}
5151

5252
function scala3_6_example() {
53-
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.3 //..."
53+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.4 //..."
5454
}
5555

5656
function semanticdb_example() {

test_thirdparty_version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runner=$(get_test_runner "${1:-local}")
1515

1616

1717
# Latest version of each major version
18-
$runner test_scala_version "3.6.3" # Latest Next version
18+
$runner test_scala_version "3.6.4" # 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
2121
$runner test_scala_version "2.13.16"

third_party/repositories/scala_3_6.bzl

+11-11
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.6.3"
6+
scala_version = "3.6.4"
77

88
artifacts = {
99
"com_github_jnr_jffi_native": {
@@ -187,12 +187,12 @@ artifacts = {
187187
],
188188
},
189189
"io_bazel_rules_scala_scala_asm": {
190-
"artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2",
191-
"sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
190+
"artifact": "org.scala-lang.modules:scala-asm:9.7.1-scala-1",
191+
"sha256": "3b764f500ee290ad44ff03db92c0de2b3ed920a1df531eab35a793f79b786379",
192192
},
193193
"io_bazel_rules_scala_scala_compiler": {
194-
"artifact": "org.scala-lang:scala3-compiler_3:3.6.3",
195-
"sha256": "80e8a82525ff9e6001c444cae5fa9ca21757489b0940a0b9f364fcc0ab0e3f8d",
194+
"artifact": "org.scala-lang:scala3-compiler_3:3.6.4",
195+
"sha256": "d0a38984801db97fd3d41c381a6807d6aabf517775de0d90e3bea0636e69ae2e",
196196
"deps": [
197197
"@io_bazel_rules_scala_scala_asm",
198198
"@io_bazel_rules_scala_scala_interfaces",
@@ -215,12 +215,12 @@ artifacts = {
215215
],
216216
},
217217
"io_bazel_rules_scala_scala_interfaces": {
218-
"artifact": "org.scala-lang:scala3-interfaces:3.6.3",
219-
"sha256": "ed6a8778dc544e9b4a2ee2a3f931d13cadaa6f7e0dd9676e205511deb7f6e394",
218+
"artifact": "org.scala-lang:scala3-interfaces:3.6.4",
219+
"sha256": "d18678e1dbb080cf39666c629371a0d6df93177982d030607528a2d2da70e034",
220220
},
221221
"io_bazel_rules_scala_scala_library": {
222-
"artifact": "org.scala-lang:scala3-library_3:3.6.3",
223-
"sha256": "cb4f2b3c9e4fe5ed01742bfa15c78fe7984dd00abc4c15f69923403ef7806f52",
222+
"artifact": "org.scala-lang:scala3-library_3:3.6.4",
223+
"sha256": "a8c962526908331e077f70f391a7493e0cdbfd14edba8c1a780daee501ca06e6",
224224
"deps": [
225225
"@io_bazel_rules_scala_scala_library_2",
226226
],
@@ -251,8 +251,8 @@ artifacts = {
251251
],
252252
},
253253
"io_bazel_rules_scala_scala_tasty_core": {
254-
"artifact": "org.scala-lang:tasty-core_3:3.6.3",
255-
"sha256": "64c848925d411ca9c22a4e9ec8bef2f2e71552e943a45878f9e5dc02b89b55f4",
254+
"artifact": "org.scala-lang:tasty-core_3:3.6.4",
255+
"sha256": "6801af0a9dc297474e7b8ce81f2caa6b8b57a54e783d290a8728fa19d34f11da",
256256
"deps": [
257257
"@io_bazel_rules_scala_scala_library",
258258
],

0 commit comments

Comments
 (0)