diff --git a/MODULE.bazel b/MODULE.bazel index 9a843ff96..57771e333 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -19,7 +19,7 @@ SCALA_2_VERSIONS = [ SCALA_3_VERSIONS = [ "3.1.3", - "3.3.6", + "3.3.7", "3.5.2", "3.6.4", "3.7.3", diff --git a/docs/cross-compilation.md b/docs/cross-compilation.md index a3ed57541..3365fe763 100644 --- a/docs/cross-compilation.md +++ b/docs/cross-compilation.md @@ -29,7 +29,7 @@ scala_config.settings( "2.12.20", "3.1.3", "3.2.2", - "3.3.6", + "3.3.7", ], ) ``` @@ -48,7 +48,7 @@ scala_config( "2.13.16", "3.1.3", "3.2.2", - "3.3.6", + "3.3.7", ], ) ``` @@ -287,7 +287,7 @@ specific Scala version. See [test_cross_build/version_specific/BUILD]( scala_library( name = "since_3_3", srcs = ["since_3_3.scala"], - scala_version = "3.3.6", + scala_version = "3.3.7", ) scala_library( diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh index 8e96e626c..1fbc7e64b 100755 --- a/dt_patches/dt_patch_test.sh +++ b/dt_patches/dt_patch_test.sh @@ -114,7 +114,7 @@ $runner test_compiler_patch 2.13.16 $runner test_compiler_patch 3.1.0 # Minimal supported version $runner test_compiler_patch 3.1.3 $runner test_compiler_patch 3.2.2 -$runner test_compiler_patch 3.3.6 +$runner test_compiler_patch 3.3.7 $runner test_compiler_patch 3.4.3 $runner test_compiler_patch 3.5.2 $runner test_compiler_patch 3.6.4 @@ -147,7 +147,7 @@ $runner test_compiler_srcjar_nonhermetic 2.13.16 $runner test_compiler_srcjar 3.1.3 $runner test_compiler_srcjar 3.2.2 -$runner test_compiler_srcjar_nonhermetic 3.3.6 +$runner test_compiler_srcjar_nonhermetic 3.3.7 $runner test_compiler_srcjar 3.4.3 $runner test_compiler_srcjar_nonhermetic 3.5.2 $runner test_compiler_srcjar_nonhermetic 3.6.4 diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel index 17b7fdd3f..f0c114af6 100644 --- a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel +++ b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel @@ -154,8 +154,8 @@ scala_deps.compiler_srcjar( version = "3.2.2", ) scala_deps.compiler_srcjar( - url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.6/scala3-compiler_3-3.3.6-sources.jar", - version = "3.3.6", + url = "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.7/scala3-compiler_3-3.3.7-sources.jar", + version = "3.3.7", ) scala_deps.compiler_srcjar( label = "@scala3_compiler_srcjar//jar:downloaded.jar", diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 576106c2a..6755022c5 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -130,8 +130,8 @@ srcjars_by_version = { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.2.2/scala3-compiler_3-3.2.2-sources.jar", "sha256": "669d580fc4a8d3c2e2d13d5735ae9be05d567613fe44482de5bcc5e2e2ee89ea", }, - "3.3.6": { - "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.6/scala3-compiler_3-3.3.6-sources.jar", + "3.3.7": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.7/scala3-compiler_3-3.3.7-sources.jar", }, "3.4.3": { "label": "@scala3_compiler_srcjar//jar:downloaded.jar", diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD index b4265de31..203cab256 100644 --- a/examples/crossbuild/3_select/BUILD +++ b/examples/crossbuild/3_select/BUILD @@ -30,6 +30,6 @@ scala_binary( name = "bin3", srcs = ["bin.scala"], main_class = "B", - scala_version = "3.3.6", + scala_version = "3.3.7", deps = [":lib"], ) diff --git a/examples/crossbuild/MODULE.bazel b/examples/crossbuild/MODULE.bazel index 82071d995..321a89522 100644 --- a/examples/crossbuild/MODULE.bazel +++ b/examples/crossbuild/MODULE.bazel @@ -19,11 +19,11 @@ scala_config = use_extension( "scala_config", ) scala_config.settings( - scala_version = "3.3.6", + scala_version = "3.3.7", scala_versions = [ "2.11.12", "2.13.16", - "3.3.6", + "3.3.7", ], ) use_repo(scala_config, "rules_scala_config") diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index bb49b1bf9..a950ccb9d 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -58,11 +58,11 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains") load("@rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.3.6", + scala_version = "3.3.7", scala_versions = [ "2.11.12", "2.13.16", - "3.3.6", + "3.3.7", ], ) diff --git a/examples/overridden_artifacts/MODULE.bazel b/examples/overridden_artifacts/MODULE.bazel index 36641e4b3..7a280c7d7 100644 --- a/examples/overridden_artifacts/MODULE.bazel +++ b/examples/overridden_artifacts/MODULE.bazel @@ -19,7 +19,7 @@ scala_config = use_extension( "scala_config", ) scala_config.settings( - scala_version = "3.3.6", + scala_version = "3.3.7", ) scala_deps = use_extension( diff --git a/examples/overridden_artifacts/WORKSPACE b/examples/overridden_artifacts/WORKSPACE index 5eeca23f8..27b67361f 100644 --- a/examples/overridden_artifacts/WORKSPACE +++ b/examples/overridden_artifacts/WORKSPACE @@ -57,7 +57,7 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains") load("@rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "3.3.6") +scala_config(scala_version = "3.3.7") load( "@rules_scala//scala:toolchains.bzl", diff --git a/scala/private/macros/compiler_sources_integrity.bzl b/scala/private/macros/compiler_sources_integrity.bzl index 60bcaf09c..de3252ee4 100644 --- a/scala/private/macros/compiler_sources_integrity.bzl +++ b/scala/private/macros/compiler_sources_integrity.bzl @@ -217,6 +217,10 @@ COMPILER_SOURCES = { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.6/scala3-compiler_3-3.3.6-sources.jar", "integrity": "sha256-EuGTpE6VhXO34oJppV31e71dyIYoOlBec3XEr83LSI4=", }, + "3.3.7": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.7/scala3-compiler_3-3.3.7-sources.jar", + "integrity": "sha256-8MQ7VceaAtATw3q1tbwMdOepLGojekAMfAJTEgda0Ls=", + }, "3.4.0": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.4.0/scala3-compiler_3-3.4.0-sources.jar", "integrity": "sha256-ynvU+5TwQecSZv/ZRKtAXPfyGEFNmT+0IHYegyijMVM=", diff --git a/scripts/README.md b/scripts/README.md index 53ea4f80a..ed5f681df 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -51,7 +51,7 @@ options: Scala version for which to update repository information; if not provided, updates all supported versions: 2.11.12, 2.12.20, 2.13.16, 3.1.3, 3.2.2, - 3.3.6, 3.4.3, 3.5.2, 3.6.4, 3.7.3 + 3.3.7, 3.4.3, 3.5.2, 3.6.4, 3.7.3 --output_dir OUTPUT_DIR Directory in which to generate or update repository files (default: .../third_party/repositories) diff --git a/scripts/create_repository.py b/scripts/create_repository.py index daecff7c4..aeba08166 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -20,7 +20,7 @@ "2.13.16", "3.1.3", "3.2.2", - "3.3.6", # LTS + "3.3.7", # LTS "3.4.3", "3.5.2", "3.6.4", diff --git a/scripts/update_compiler_sources_integrity.py b/scripts/update_compiler_sources_integrity.py index 09154cbfc..651d3ded1 100755 --- a/scripts/update_compiler_sources_integrity.py +++ b/scripts/update_compiler_sources_integrity.py @@ -29,7 +29,7 @@ ] + [ f'3.2.{patch}' for patch in range(0, 3) # 3.2.0 to 3.2.2 ] + [ - f'3.3.{patch}' for patch in range(0, 7) # 3.3.0 to 3.3.6 + f'3.3.{patch}' for patch in range(0, 8) # 3.3.0 to 3.3.7 ] + [ f'3.4.{patch}' for patch in range(0, 4) # 3.4.0 to 3.4.3 ] + [ diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh index e4604e387..e9e5693f7 100755 --- a/test/shell/test_examples.sh +++ b/test/shell/test_examples.sh @@ -42,7 +42,7 @@ test_scala3_2_example() { } test_scala3_3_example() { - run_in_example_dir scala3 bazel build --repo_env=SCALA_VERSION=3.3.6 //... + run_in_example_dir scala3 bazel build --repo_env=SCALA_VERSION=3.3.7 //... } test_scala3_4_example() { diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh index 4532e5232..74e276c1c 100755 --- a/test/shell/test_invalid_scalacopts.sh +++ b/test/shell/test_invalid_scalacopts.sh @@ -26,7 +26,7 @@ test_logs_not_contains() { _check_failing_action 'action_should_fail_without_message' "$@" } -for scalaVersion in 2.12.20 2.13.16 3.3.6; do +for scalaVersion in 2.12.20 2.13.16 3.3.7; do if [[ "$scalaVersion" == 3.* ]]; then $runner test_logs_contains $scalaVersion "not-existing is not a valid choice for -source" else diff --git a/test/shell/test_semanticdb.sh b/test/shell/test_semanticdb.sh index d0e74b536..510743012 100755 --- a/test/shell/test_semanticdb.sh +++ b/test/shell/test_semanticdb.sh @@ -33,7 +33,7 @@ test_produces_semanticdb(){ fi if [ $scala_majver -eq 3 ]; then - options+=("--repo_env=SCALA_VERSION=3.3.6") + options+=("--repo_env=SCALA_VERSION=3.3.7") fi bazel build //test/semanticdb:semantic_provider_vars_all "${options[@]}" diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel index 907ffcb6f..2ec63335d 100644 --- a/test_cross_build/MODULE.bazel +++ b/test_cross_build/MODULE.bazel @@ -26,7 +26,7 @@ scala_config.settings( "2.13.16", "3.1.3", "3.2.2", - "3.3.6", + "3.3.7", ], ) use_repo(scala_config, "rules_scala_config") diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index 3337aa343..ddbe80ed3 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -65,7 +65,7 @@ scala_config( "2.13.16", "3.1.3", "3.2.2", - "3.3.6", + "3.3.7", ], ) diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD index f808b95c3..fb5690f91 100644 --- a/test_cross_build/scalafmt/BUILD +++ b/test_cross_build/scalafmt/BUILD @@ -36,7 +36,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.6", + scala_version = "3.3.7", ) scalafmt_scala_library( @@ -44,7 +44,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.6", + scala_version = "3.3.7", ) scalafmt_scala_binary( diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD index 35e5afc67..2787b5cef 100644 --- a/test_cross_build/version_specific/BUILD +++ b/test_cross_build/version_specific/BUILD @@ -7,7 +7,7 @@ load("@rules_scala//scala:scala.bzl", "scala_library") scala_library( name = "since_3_3", srcs = ["since_3_3.scala"], - scala_version = "3.3.6", + scala_version = "3.3.7", ) scala_library( @@ -43,7 +43,7 @@ scala_library( "since_3_2.scala", "since_3_3.scala", ], - scala_version = "3.3.6", + scala_version = "3.3.7", ) scala_library( diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh index 8cb8d2f78..ea316ad78 100755 --- a/test_thirdparty_version.sh +++ b/test_thirdparty_version.sh @@ -16,7 +16,7 @@ runner=$(get_test_runner "${1:-local}") # Latest version of each major version $runner test_scala_version "3.7.3" # Latest Next version -$runner test_scala_version "3.3.6" # Latest LTS version +$runner test_scala_version "3.3.7" # 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.16" $runner test_scala_version "2.12.20" diff --git a/test_version.sh b/test_version.sh index ebd85f6e8..5c4de9684 100755 --- a/test_version.sh +++ b/test_version.sh @@ -4,7 +4,7 @@ set -e scala_2_12_version="2.12.20" scala_2_13_version="2.13.16" -scala_3_version="3.3.6" +scala_3_version="3.3.7" SCALA_VERSION_DEFAULT=$scala_2_12_version diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 07a6c5c4a..8c9d5795f 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -3,7 +3,7 @@ Mostly generated and updated by scripts/create_repository.py. """ -scala_version = "3.3.6" +scala_version = "3.3.7" artifacts = { "com_github_jnr_jffi_native": { @@ -190,8 +190,8 @@ artifacts = { "sha256": "86af037580bdf9ce9c05f8b2afd734daf1a8564c38cd10ca5d08bf81508ad2e4", }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala3-compiler_3:3.3.6", - "sha256": "3312960a654fd3421b1396378734ccb693bc0cbed21cca9e3974ad6f0c24191d", + "artifact": "org.scala-lang:scala3-compiler_3:3.3.7", + "sha256": "e15fed89fb45248550c8227ea407c0eb496a6afb7bdf7abba4285d2fe55baf44", "deps": [ "@io_bazel_rules_scala_scala_asm", "@io_bazel_rules_scala_scala_interfaces", @@ -214,12 +214,12 @@ artifacts = { ], }, "io_bazel_rules_scala_scala_interfaces": { - "artifact": "org.scala-lang:scala3-interfaces:3.3.6", - "sha256": "c118e77fec7721aac392bcff3afe6a7cae8311f6d327fadb001f8560521d647d", + "artifact": "org.scala-lang:scala3-interfaces:3.3.7", + "sha256": "f57f897043efda83576b5c18ce01df5a5a1c2033eeb26224fc2a8d1fb779f82c", }, "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala3-library_3:3.3.6", - "sha256": "cf4ddaf76c0ce71cf68ca5d2dc7bad46c5a921aaf18909317ddc9ba6e67fb12b", + "artifact": "org.scala-lang:scala3-library_3:3.3.7", + "sha256": "a16e046f4a9df9e0d0e0bc54bf6298c94d7d867457f7b3b68291a88c568b92d0", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -250,8 +250,8 @@ artifacts = { ], }, "io_bazel_rules_scala_scala_tasty_core": { - "artifact": "org.scala-lang:tasty-core_3:3.3.6", - "sha256": "8618e08433fc306053040794587e12105fca4e8c9f096adb55823442a494329b", + "artifact": "org.scala-lang:tasty-core_3:3.3.7", + "sha256": "0748cd71c48398888313cb3c00b8aad39bd02f94d43cbca657d52903517a1e5a", "deps": [ "@io_bazel_rules_scala_scala_library", ],