diff --git a/MODULE.bazel b/MODULE.bazel index c5df8e81c..7e05b3e8b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -19,7 +19,7 @@ SCALA_2_VERSIONS = [ SCALA_3_VERSIONS = [ "3.1.3", - "3.3.5", + "3.3.6", "3.5.2", "3.6.4", "3.7.0", diff --git a/docs/cross-compilation.md b/docs/cross-compilation.md index 144fcb541..a3ed57541 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.5", + "3.3.6", ], ) ``` @@ -48,7 +48,7 @@ scala_config( "2.13.16", "3.1.3", "3.2.2", - "3.3.5", + "3.3.6", ], ) ``` @@ -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.5", + scala_version = "3.3.6", ) scala_library( diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh index 1d0fc3cfe..d30111283 100755 --- a/dt_patches/dt_patch_test.sh +++ b/dt_patches/dt_patch_test.sh @@ -120,7 +120,7 @@ run_test_local test_compiler_patch 2.13.16 run_test_local test_compiler_patch 3.1.0 # Minimal supported version run_test_local test_compiler_patch 3.1.3 run_test_local test_compiler_patch 3.2.2 -run_test_local test_compiler_patch 3.3.5 +run_test_local test_compiler_patch 3.3.6 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.4 @@ -153,7 +153,7 @@ run_test_local test_compiler_srcjar_nonhermetic 2.13.16 run_test_local test_compiler_srcjar 3.1.3 run_test_local test_compiler_srcjar 3.2.2 -run_test_local test_compiler_srcjar_nonhermetic 3.3.5 +run_test_local test_compiler_srcjar_nonhermetic 3.3.6 run_test_local test_compiler_srcjar 3.4.3 run_test_local test_compiler_srcjar_nonhermetic 3.5.2 run_test_local 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 bb5fc84fe..9611d8c49 100644 --- a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel +++ b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel @@ -155,8 +155,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.5/scala3-compiler_3-3.3.5-sources.jar", - version = "3.3.5", + 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", ) 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 5e133b1e1..e20eddbbd 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -135,8 +135,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.5": { - "url": "https://repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.3.5/scala3-compiler_3-3.3.5-sources.jar", + "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.4.3": { "label": "@scala3_compiler_srcjar//jar:downloaded.jar", diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD index 0db320ec8..b4265de31 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.5", + scala_version = "3.3.6", deps = [":lib"], ) diff --git a/examples/crossbuild/MODULE.bazel b/examples/crossbuild/MODULE.bazel index dbec1a99d..fc341b53b 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.5", + scala_version = "3.3.6", scala_versions = [ "2.11.12", "2.13.16", - "3.3.5", + "3.3.6", ], ) use_repo(scala_config, "rules_scala_config") diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 714af53bd..839417c97 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -63,11 +63,11 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains") load("@rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.3.5", + scala_version = "3.3.6", scala_versions = [ "2.11.12", "2.13.16", - "3.3.5", + "3.3.6", ], ) diff --git a/examples/overridden_artifacts/MODULE.bazel b/examples/overridden_artifacts/MODULE.bazel index a7d064e88..ce05be79f 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.5", + scala_version = "3.3.6", ) scala_deps = use_extension( diff --git a/examples/overridden_artifacts/WORKSPACE b/examples/overridden_artifacts/WORKSPACE index ad4a05f2d..16ad12966 100644 --- a/examples/overridden_artifacts/WORKSPACE +++ b/examples/overridden_artifacts/WORKSPACE @@ -62,7 +62,7 @@ scala_protoc_toolchains(name = "rules_scala_protoc_toolchains") load("@rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "3.3.5") +scala_config(scala_version = "3.3.6") load( "@rules_scala//scala:toolchains.bzl", diff --git a/scripts/README.md b/scripts/README.md index 92332a52b..5917e10fe 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.5, 3.4.3, 3.5.2, 3.6.4, 3.7.0 + 3.3.6, 3.4.3, 3.5.2, 3.6.4, 3.7.0 --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 5a64aee19..079c6d860 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.5", + "3.3.6", # LTS "3.4.3", "3.5.2", "3.6.4", diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh index 5f8c0bf44..b0c1375ef 100755 --- a/test/shell/test_examples.sh +++ b/test/shell/test_examples.sh @@ -38,7 +38,7 @@ function scala3_2_example() { } function scala3_3_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.5 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.6 //..." } function scala3_4_example() { diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh index d81cee7f2..dd07ec869 100755 --- a/test/shell/test_invalid_scalacopts.sh +++ b/test/shell/test_invalid_scalacopts.sh @@ -25,7 +25,7 @@ test_logs_not_contains() { 2>&1 | grep -v "$expected" } -for scalaVersion in 2.12.20 2.13.16 3.3.5; do +for scalaVersion in 2.12.20 2.13.16 3.3.6; 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 eefec3a3d..77c716685 100755 --- a/test/shell/test_semanticdb.sh +++ b/test/shell/test_semanticdb.sh @@ -30,7 +30,7 @@ test_produces_semanticdb(){ fi if [ $scala_majver -eq 3 ]; then - local version_opt="--repo_env=SCALA_VERSION=3.3.5" + local version_opt="--repo_env=SCALA_VERSION=3.3.6" fi diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel index a5ac5075c..cf2d49064 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.5", + "3.3.6", ], ) use_repo(scala_config, "rules_scala_config") diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index c3d5830d3..65188d02f 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -70,7 +70,7 @@ scala_config( "2.13.16", "3.1.3", "3.2.2", - "3.3.5", + "3.3.6", ], ) diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD index 0d219d2bc..f808b95c3 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.5", + scala_version = "3.3.6", ) scalafmt_scala_library( @@ -44,7 +44,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.5", + scala_version = "3.3.6", ) scalafmt_scala_binary( diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD index d0ee003e4..35e5afc67 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.5", + scala_version = "3.3.6", ) scala_library( @@ -43,7 +43,7 @@ scala_library( "since_3_2.scala", "since_3_3.scala", ], - scala_version = "3.3.5", + scala_version = "3.3.6", ) scala_library( diff --git a/test_thirdparty_version.sh b/test_thirdparty_version.sh index 6fa8ba7c1..0f98e5384 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.0" # Latest Next version -$runner test_scala_version "3.3.5" # Latest LTS version +$runner test_scala_version "3.3.6" # 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 a38148510..e03853e2a 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.5" +scala_3_version="3.3.6" 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 e8ea32a7e..501ee8267 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.5" +scala_version = "3.3.6" artifacts = { "com_github_jnr_jffi_native": { @@ -186,12 +186,12 @@ artifacts = { ], }, "io_bazel_rules_scala_scala_asm": { - "artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2", - "sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772", + "artifact": "org.scala-lang.modules:scala-asm:9.8.0-scala-1", + "sha256": "86af037580bdf9ce9c05f8b2afd734daf1a8564c38cd10ca5d08bf81508ad2e4", }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala3-compiler_3:3.3.5", - "sha256": "f067da9a52ec450efa5d1cc1a3325b7f9882874a059b11728969460d170ed424", + "artifact": "org.scala-lang:scala3-compiler_3:3.3.6", + "sha256": "3312960a654fd3421b1396378734ccb693bc0cbed21cca9e3974ad6f0c24191d", "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.5", - "sha256": "b44fcdf2d4aef100ab2a24f88b5432b3f487de91ab38f54c8e0b96cb35913c93", + "artifact": "org.scala-lang:scala3-interfaces:3.3.6", + "sha256": "c118e77fec7721aac392bcff3afe6a7cae8311f6d327fadb001f8560521d647d", }, "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala3-library_3:3.3.5", - "sha256": "26163f54674adb4c3e2151155f7f6f17095a0be10ebfb884ee8cdca98adca248", + "artifact": "org.scala-lang:scala3-library_3:3.3.6", + "sha256": "cf4ddaf76c0ce71cf68ca5d2dc7bad46c5a921aaf18909317ddc9ba6e67fb12b", "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.5", - "sha256": "7e14a81eaebe0c23ac5350e5421691d46206a46ce88493450ec625ef47498922", + "artifact": "org.scala-lang:tasty-core_3:3.3.6", + "sha256": "8618e08433fc306053040794587e12105fca4e8c9f096adb55823442a494329b", "deps": [ "@io_bazel_rules_scala_scala_library", ],