Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scala 3.4.3 support #1603

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Scala 3.4.3 support #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
450b5bf
scala 3.4.2 support
lm1nrt Aug 26, 2024
b5f8a8f
Merge branch 'master' into michal-lenart/scala-3.4.2-support
lm1nrt Aug 26, 2024
7358b86
3.4.3 hotfix
lm1nrt Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/scala3/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ local_repository(

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

scala_config(scala_version = "3.3.3")
scala_config(scala_version = "3.4.3")

load(
"@io_bazel_rules_scala//scala:scala.bzl",
Expand Down
1 change: 1 addition & 0 deletions scala/private/macros/scala_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def _artifact_ids(scala_version):
"io_bazel_rules_scala_scala_xml",
"io_bazel_rules_scala_scala_parser_combinators",
"io_bazel_rules_scala_scala_library_2",
"org_scala_sbt_compiler_interface",
lm1nrt marked this conversation as resolved.
Show resolved Hide resolved
]

def rules_scala_toolchain_deps_repositories(
Expand Down
1 change: 1 addition & 0 deletions scala/private/macros/setup_scala_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ _DEFAULT_DEPS = {
"@io_bazel_rules_scala_scala_tasty_core",
"@io_bazel_rules_scala_scala_asm",
"@io_bazel_rules_scala_scala_library_2",
"@org_scala_sbt_compiler_interface",
],
},
"scala_library_classpath": {
Expand Down
5 changes: 5 additions & 0 deletions test/shell/test_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ function scala3_3_example() {
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.3 //..."
}

function scala3_4_example() {
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.4.3 //..."
}

function semanticdb_example() {

function build_semanticdb_example(){
Expand All @@ -62,4 +66,5 @@ $runner semanticdb_example
$runner scala3_1_example
$runner scala3_2_example
$runner scala3_3_example
$runner scala3_4_example
$runner cross_build_example
7 changes: 7 additions & 0 deletions third_party/repositories/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ load(
_artifacts_3_3 = "artifacts",
_scala_version_3_3 = "scala_version",
)
load(
"//third_party/repositories:scala_3_4.bzl",
_artifacts_3_4 = "artifacts",
_scala_version_3_4 = "scala_version",
)
load(
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
"default_maven_server_urls",
Expand All @@ -47,6 +52,7 @@ artifacts_by_major_scala_version = {
"3.1": _artifacts_3_1,
"3.2": _artifacts_3_2,
"3.3": _artifacts_3_3,
"3.4": _artifacts_3_4,
}

scala_version_by_major_scala_version = {
Expand All @@ -56,6 +62,7 @@ scala_version_by_major_scala_version = {
"3.1": _scala_version_3_1,
"3.2": _scala_version_3_2,
"3.3": _scala_version_3_3,
"3.4": _scala_version_3_4,
}

def repositories(
Expand Down
4 changes: 4 additions & 0 deletions third_party/repositories/scala_3_1.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ artifacts = {
"@io_bazel_rules_scala_scala_library",
],
},
"org_scala_sbt_compiler_interface": {
lm1nrt marked this conversation as resolved.
Show resolved Hide resolved
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
},
"org_scalameta_fastparse": {
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",
Expand Down
4 changes: 4 additions & 0 deletions third_party/repositories/scala_3_2.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ artifacts = {
"@io_bazel_rules_scala_scala_library",
],
},
"org_scala_sbt_compiler_interface": {
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
},
"org_scalameta_fastparse": {
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",
Expand Down
4 changes: 4 additions & 0 deletions third_party/repositories/scala_3_3.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ artifacts = {
"@io_bazel_rules_scala_scala_library",
],
},
"org_scala_sbt_compiler_interface": {
"artifact": "org.scala-sbt:compiler-interface:1.10.1",
"sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d",
},
"org_scalameta_fastparse": {
"artifact": "org.scalameta:fastparse-v2_2.13:2.3.1",
"sha256": "8fca8597ad6d7c13c48009ee13bbe80c176b08ab12e68af54a50f7f69d8447c5",
Expand Down
Loading