Skip to content

Upgrade Scala 3.6 to 3.6.3 #1682

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

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Upgrade Scala 3.6 to 3.6.3 #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba3ba6
Upgrade Scala 3.6 to 3.6.3
WojciechMazur Jan 20, 2025
fbc7293
Fix CI issues - include jline-terminal-jni
WojciechMazur Jan 20, 2025
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
1 change: 1 addition & 0 deletions dt_patches/dt_patch_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ run_test_local test_compiler_patch 3.3.4
run_test_local test_compiler_patch 3.4.3
run_test_local test_compiler_patch 3.5.2
run_test_local test_compiler_patch 3.6.2
run_test_local test_compiler_patch 3.6.3

run_test_local test_compiler_srcjar_error 2.12.11
run_test_local test_compiler_srcjar_error 2.12.12
Expand Down
3 changes: 3 additions & 0 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ srcjars_by_version = {
"3.6.2": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.2/scala3-compiler_3-3.6.2-sources.jar",
},
"3.6.3": {
"url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.6.3/scala3-compiler_3-3.6.3-sources.jar",
},
}

load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_toolchains")
Expand Down
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 @@ -50,7 +50,7 @@ rules_proto_toolchains()

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

scala_config(scala_version = "3.6.2")
scala_config(scala_version = "3.6.3")

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

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 @@ -177,6 +177,7 @@ def _artifact_ids(scala_version):
"org_jline_jline_reader",
"org_jline_jline_terminal",
"org_jline_jline_terminal_jna",
"org_jline_jline_terminal_jni",
"org_scala_sbt_compiler_interface",
"org_scala_sbt_util_interface",
])
Expand Down
3 changes: 2 additions & 1 deletion scripts/create_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"3.3.4",
"3.4.3",
"3.5.2",
"3.6.2"
"3.6.3"
]
PARSER_COMBINATORS_VERSION = '1.1.2'
SBT_COMPILER_INTERFACE_VERSION = '1.10.4'
Expand Down Expand Up @@ -133,6 +133,7 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]:
f'org.jline:jline-reader:{JLINE_VERSION}',
f'org.jline:jline-terminal:{JLINE_VERSION}',
f'org.jline:jline-terminal-jna:{JLINE_VERSION}',
f'org.jline:jline-terminal-jni:{JLINE_VERSION}',
])

else:
Expand Down
2 changes: 1 addition & 1 deletion test/shell/test_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function scala3_5_example() {
}

function scala3_6_example() {
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.2 //..."
test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.6.3 //..."
}

function semanticdb_example() {
Expand Down
2 changes: 1 addition & 1 deletion test_thirdparty_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runner=$(get_test_runner "${1:-local}")


# Latest version of each major version
$runner test_scala_version "3.6.2" # Latest Next version
$runner test_scala_version "3.6.3" # Latest Next version
$runner test_scala_version "3.3.4" # Latest LTS version
$runner test_scala_version "3.1.3" # First supported major for Scala 3, max supported JDK=18
$runner test_scala_version "2.13.15"
Expand Down
8 changes: 8 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 @@ -495,6 +495,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down
8 changes: 8 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 @@ -495,6 +495,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down
8 changes: 8 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 @@ -496,6 +496,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down
8 changes: 8 additions & 0 deletions third_party/repositories/scala_3_4.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down
8 changes: 8 additions & 0 deletions third_party/repositories/scala_3_5.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down
28 changes: 18 additions & 10 deletions third_party/repositories/scala_3_6.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Mostly generated and updated by scripts/create_repository.py.
"""

scala_version = "3.6.2"
scala_version = "3.6.3"

artifacts = {
"com_geirsson_metaconfig_core": {
Expand Down Expand Up @@ -221,16 +221,16 @@ artifacts = {
"sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772",
},
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala3-compiler_3:3.6.2",
"sha256": "a887d13b2ab1f016f5bc7a39eb88cd3791158749f5b21d8af53aa7fe76a4540e",
"artifact": "org.scala-lang:scala3-compiler_3:3.6.3",
"sha256": "80e8a82525ff9e6001c444cae5fa9ca21757489b0940a0b9f364fcc0ab0e3f8d",
"deps": [
"@io_bazel_rules_scala_scala_asm",
"@io_bazel_rules_scala_scala_interfaces",
"@io_bazel_rules_scala_scala_library",
"@io_bazel_rules_scala_scala_tasty_core",
"@org_jline_jline_reader",
"@org_jline_jline_terminal",
"@org_jline_jline_terminal_jna",
"@org_jline_jline_terminal_jni",
"@org_scala_sbt_compiler_interface",
],
},
Expand All @@ -239,12 +239,12 @@ artifacts = {
"sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9",
},
"io_bazel_rules_scala_scala_interfaces": {
"artifact": "org.scala-lang:scala3-interfaces:3.6.2",
"sha256": "85b8b46a074537a90b999e9b0ccb3e9fba00c5d47d1fbaaf4fd39bf1151327f6",
"artifact": "org.scala-lang:scala3-interfaces:3.6.3",
"sha256": "ed6a8778dc544e9b4a2ee2a3f931d13cadaa6f7e0dd9676e205511deb7f6e394",
},
"io_bazel_rules_scala_scala_library": {
"artifact": "org.scala-lang:scala3-library_3:3.6.2",
"sha256": "32c6e2e40f89195a1886bfc7da99c2b9f01edba6caf86ae2d51ec4d5a62da672",
"artifact": "org.scala-lang:scala3-library_3:3.6.3",
"sha256": "cb4f2b3c9e4fe5ed01742bfa15c78fe7984dd00abc4c15f69923403ef7806f52",
"deps": [
"@io_bazel_rules_scala_scala_library_2",
],
Expand Down Expand Up @@ -275,8 +275,8 @@ artifacts = {
],
},
"io_bazel_rules_scala_scala_tasty_core": {
"artifact": "org.scala-lang:tasty-core_3:3.6.2",
"sha256": "e6f771f246316a7f54310a61c8d7fc6dd7cc4056b00c83e3bf032eed0166071f",
"artifact": "org.scala-lang:tasty-core_3:3.6.3",
"sha256": "64c848925d411ca9c22a4e9ec8bef2f2e71552e943a45878f9e5dc02b89b55f4",
"deps": [
"@io_bazel_rules_scala_scala_library",
],
Expand Down Expand Up @@ -505,6 +505,14 @@ artifacts = {
"@org_jline_jline_terminal",
],
},
"org_jline_jline_terminal_jni": {
"artifact": "org.jline:jline-terminal-jni:3.27.1",
"sha256": "e4bc64f1e68e9fb25d80517338e76abca1e0145b82e389b5c2b2c7d71d150f82",
"deps": [
"@org_jline_jline_native",
"@org_jline_jline_terminal",
],
},
"org_scala_lang_modules_scala_collection_compat": {
"artifact": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0",
"sha256": "befff482233cd7f9a7ca1e1f5a36ede421c018e6ce82358978c475d45532755f",
Expand Down