Skip to content

Commit 3010cfa

Browse files
Add Scala 3.7.0 (#1733)
* Add Scala 3.7.0 * Add Scala 3.7 to repositories
1 parent 200790a commit 3010cfa

File tree

11 files changed

+987
-4
lines changed

11 files changed

+987
-4
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SCALA_3_VERSIONS = [
2222
"3.3.5",
2323
"3.5.2",
2424
"3.6.4",
25+
"3.7.0",
2526
]
2627

2728
SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS

dt_patches/dt_patch_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ 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
126126
run_test_local test_compiler_patch 3.6.4
127+
run_test_local test_compiler_patch 3.7.0
127128

128129
run_test_local test_compiler_srcjar_error 2.12.11
129130
run_test_local test_compiler_srcjar_error 2.12.12
@@ -156,3 +157,4 @@ run_test_local test_compiler_srcjar_nonhermetic 3.3.5
156157
run_test_local test_compiler_srcjar 3.4.3
157158
run_test_local test_compiler_srcjar_nonhermetic 3.5.2
158159
run_test_local test_compiler_srcjar_nonhermetic 3.6.4
160+
run_test_local test_compiler_srcjar_nonhermetic 3.7.0

dt_patches/test_dt_patches_user_srcjar/MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ scala_deps.compiler_srcjar(
170170
url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.4/scala3-compiler_3-3.6.4-sources.jar",
171171
version = "3.6.4",
172172
)
173+
scala_deps.compiler_srcjar(
174+
url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.0/scala3-compiler_3-3.7.0-sources.jar",
175+
version = "3.7.0",
176+
)
173177

174178
scala_protoc = use_extension(
175179
"@rules_scala//scala/extensions:protoc.bzl",

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ srcjars_by_version = {
147147
"3.6.4": {
148148
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.4/scala3-compiler_3-3.6.4-sources.jar",
149149
},
150+
"3.7.0": {
151+
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.7.0/scala3-compiler_3-3.7.0-sources.jar",
152+
},
150153
}
151154

152155
load("@rules_scala//scala:toolchains.bzl", "scala_toolchains")

examples/scala3/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.6.4")
65+
scala_config(scala_version = "3.7.0")
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
54+
3.3.5, 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"3.3.5",
2424
"3.4.3",
2525
"3.5.2",
26-
"3.6.4"
26+
"3.6.4",
27+
"3.7.0",
2728
]
2829
PARSER_COMBINATORS_VERSION = '1.1.2'
2930
SBT_COMPILER_INTERFACE_VERSION = '1.10.8'

test/shell/test_examples.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ function scala3_6_example() {
5353
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.4 //..."
5454
}
5555

56+
function scala3_7_example() {
57+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.7.0 //..."
58+
}
59+
5660
function semanticdb_example() {
5761

5862
function build_semanticdb_example(){

test_thirdparty_version.sh

Lines changed: 1 addition & 1 deletion
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.4" # Latest Next version
18+
$runner test_scala_version "3.7.0" # 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/repositories.bzl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ load(
5353
_artifacts_3_6 = "artifacts",
5454
_scala_version_3_6 = "scala_version",
5555
)
56+
load(
57+
"//third_party/repositories:scala_3_7.bzl",
58+
_artifacts_3_7 = "artifacts",
59+
_scala_version_3_7 = "scala_version",
60+
)
5661
load("@rules_scala_config//:config.bzl", "SCALA_VERSION")
5762

5863
artifacts_by_major_scala_version = {
@@ -65,6 +70,7 @@ artifacts_by_major_scala_version = {
6570
"3.4": _artifacts_3_4,
6671
"3.5": _artifacts_3_5,
6772
"3.6": _artifacts_3_6,
73+
"3.7": _artifacts_3_7,
6874
}
6975

7076
scala_version_by_major_scala_version = {
@@ -77,6 +83,7 @@ scala_version_by_major_scala_version = {
7783
"3.4": _scala_version_3_4,
7884
"3.5": _scala_version_3_5,
7985
"3.6": _scala_version_3_6,
86+
"3.7": _scala_version_3_7,
8087
}
8188

8289
def repositories(

0 commit comments

Comments
 (0)