Skip to content

Commit 719f353

Browse files
Add Scala 3.6.2 support (bazel-contrib#1672)
1 parent 6a97ace commit 719f353

File tree

8 files changed

+950
-4
lines changed

8 files changed

+950
-4
lines changed

dt_patches/dt_patch_test.sh

+2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ run_test_local test_compiler_patch 3.2.2
122122
run_test_local test_compiler_patch 3.3.4
123123
run_test_local test_compiler_patch 3.4.3
124124
run_test_local test_compiler_patch 3.5.2
125+
run_test_local test_compiler_patch 3.6.2
125126

126127
run_test_local test_compiler_srcjar_error 2.12.11
127128
run_test_local test_compiler_srcjar_error 2.12.12
@@ -152,3 +153,4 @@ run_test_local test_compiler_srcjar 3.2.2
152153
run_test_local test_compiler_srcjar_nonhermetic 3.3.4
153154
run_test_local test_compiler_srcjar 3.4.3
154155
run_test_local test_compiler_srcjar_nonhermetic 3.5.2
156+
run_test_local test_compiler_srcjar_nonhermetic 3.6.2

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

+3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ srcjars_by_version = {
108108
"3.5.2": {
109109
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.5.2/scala3-compiler_3-3.5.2-sources.jar",
110110
},
111+
"3.6.2": {
112+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.2/scala3-compiler_3-3.6.2-sources.jar",
113+
},
111114
}
112115

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

examples/scala3/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ local_repository(
2929

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

32-
scala_config(scala_version = "3.5.2")
32+
scala_config(scala_version = "3.6.2")
3333

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

scripts/create_repository.py

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"3.3.4",
2424
"3.4.3",
2525
"3.5.2",
26+
"3.6.2"
2627
]
2728
PARSER_COMBINATORS_VERSION = '1.1.2'
2829
SBT_COMPILER_INTERFACE_VERSION = '1.10.4'

test/shell/test_examples.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ function scala3_3_example() {
4343

4444
function scala3_4_example() {
4545
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.3 //..."
46-
}
46+
}
4747

4848
function scala3_5_example() {
4949
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.2 //..."
50-
}
50+
}
51+
52+
function scala3_6_example() {
53+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.2 //..."
54+
}
5155

5256
function semanticdb_example() {
5357

@@ -72,4 +76,5 @@ $runner scala3_2_example
7276
$runner scala3_3_example
7377
$runner scala3_4_example
7478
$runner scala3_5_example
79+
$runner scala3_6_example
7580
$runner cross_build_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.5.2" # Latest Next version
18+
$runner test_scala_version "3.6.2" # Latest Next version
1919
$runner test_scala_version "3.3.4" # 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"

third_party/repositories/repositories.bzl

+7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ load(
3838
_artifacts_3_5 = "artifacts",
3939
_scala_version_3_5 = "scala_version",
4040
)
41+
load(
42+
"//third_party/repositories:scala_3_6.bzl",
43+
_artifacts_3_6 = "artifacts",
44+
_scala_version_3_6 = "scala_version",
45+
)
4146
load(
4247
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
4348
"default_maven_server_urls",
@@ -59,6 +64,7 @@ artifacts_by_major_scala_version = {
5964
"3.3": _artifacts_3_3,
6065
"3.4": _artifacts_3_4,
6166
"3.5": _artifacts_3_5,
67+
"3.6": _artifacts_3_6,
6268
}
6369

6470
scala_version_by_major_scala_version = {
@@ -70,6 +76,7 @@ scala_version_by_major_scala_version = {
7076
"3.3": _scala_version_3_3,
7177
"3.4": _scala_version_3_4,
7278
"3.5": _scala_version_3_5,
79+
"3.6": _scala_version_3_6,
7380
}
7481

7582
def repositories(

0 commit comments

Comments
 (0)