Skip to content

Commit 2d90d53

Browse files
authored
Scala 3.4.3 support (bazel-contrib#1603)
* scala 3.4.2 support * 3.4.3 hotfix
1 parent 5a2453e commit 2d90d53

File tree

9 files changed

+558
-1
lines changed

9 files changed

+558
-1
lines changed

examples/scala3/WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local_repository(
1818

1919
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
2020

21-
scala_config(scala_version = "3.3.3")
21+
scala_config(scala_version = "3.4.3")
2222

2323
load(
2424
"@io_bazel_rules_scala//scala:scala.bzl",

scala/private/macros/scala_repositories.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ def _artifact_ids(scala_version):
140140
"io_bazel_rules_scala_scala_xml",
141141
"io_bazel_rules_scala_scala_parser_combinators",
142142
"io_bazel_rules_scala_scala_library_2",
143+
"org_scala_sbt_compiler_interface",
143144
]
144145

145146
def rules_scala_toolchain_deps_repositories(

scala/private/macros/setup_scala_toolchain.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ _DEFAULT_DEPS = {
116116
"@io_bazel_rules_scala_scala_tasty_core",
117117
"@io_bazel_rules_scala_scala_asm",
118118
"@io_bazel_rules_scala_scala_library_2",
119+
"@org_scala_sbt_compiler_interface",
119120
],
120121
},
121122
"scala_library_classpath": {

test/shell/test_examples.sh

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ function scala3_3_example() {
4141
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.3 //..."
4242
}
4343

44+
function scala3_4_example() {
45+
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.3 //..."
46+
}
47+
4448
function semanticdb_example() {
4549

4650
function build_semanticdb_example(){
@@ -62,4 +66,5 @@ $runner semanticdb_example
6266
$runner scala3_1_example
6367
$runner scala3_2_example
6468
$runner scala3_3_example
69+
$runner scala3_4_example
6570
$runner cross_build_example

third_party/repositories/repositories.bzl

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ load(
2828
_artifacts_3_3 = "artifacts",
2929
_scala_version_3_3 = "scala_version",
3030
)
31+
load(
32+
"//third_party/repositories:scala_3_4.bzl",
33+
_artifacts_3_4 = "artifacts",
34+
_scala_version_3_4 = "scala_version",
35+
)
3136
load(
3237
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
3338
"default_maven_server_urls",
@@ -47,6 +52,7 @@ artifacts_by_major_scala_version = {
4752
"3.1": _artifacts_3_1,
4853
"3.2": _artifacts_3_2,
4954
"3.3": _artifacts_3_3,
55+
"3.4": _artifacts_3_4,
5056
}
5157

5258
scala_version_by_major_scala_version = {
@@ -56,6 +62,7 @@ scala_version_by_major_scala_version = {
5662
"3.1": _scala_version_3_1,
5763
"3.2": _scala_version_3_2,
5864
"3.3": _scala_version_3_3,
65+
"3.4": _scala_version_3_4,
5966
}
6067

6168
def repositories(

third_party/repositories/scala_3_1.bzl

+4
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ artifacts = {
9999
"@io_bazel_rules_scala_scala_library",
100100
],
101101
},
102+
"org_scala_sbt_compiler_interface": {
103+
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
104+
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
105+
},
102106
"org_scalameta_fastparse": {
103107
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
104108
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",

third_party/repositories/scala_3_2.bzl

+4
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ artifacts = {
9999
"@io_bazel_rules_scala_scala_library",
100100
],
101101
},
102+
"org_scala_sbt_compiler_interface": {
103+
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
104+
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
105+
},
102106
"org_scalameta_fastparse": {
103107
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
104108
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",

third_party/repositories/scala_3_3.bzl

+4
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ artifacts = {
9797
"@io_bazel_rules_scala_scala_library",
9898
],
9999
},
100+
"org_scala_sbt_compiler_interface": {
101+
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
102+
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
103+
},
100104
"org_scalameta_fastparse": {
101105
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
102106
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",

0 commit comments

Comments
 (0)