diff --git a/README.md b/README.md index 269aa4999..0384c0582 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ scalatest_toolchain() ``` This will load the `rules_scala` repository at the commit sha -`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.19) +`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.20) Then in your BUILD file just add the following so the rules will be available: ```starlark @@ -143,13 +143,13 @@ Previous minor versions may work but are supported only on a best effort basis. To configure Scala version you must call `scala_config(scala_version = "2.xx.xx")` and configure dependencies by declaring [scala_toolchain](docs/scala_toolchain.md). For a quick start you can use `scala_repositories()` and `scala_register_toolchains()`, which have -dependency providers configured for `2.11.12`, `2.12.19` and `2.13.14` versions. +dependency providers configured for `2.11.12`, `2.12.20` and `2.13.15` versions. ```starlark # WORKSPACE load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "2.13.14") +scala_config(scala_version = "2.13.15") load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") rules_proto_dependencies() diff --git a/dt_patches/dt_patch_test.sh b/dt_patches/dt_patch_test.sh index 7bd9e89d9..bd1864787 100755 --- a/dt_patches/dt_patch_test.sh +++ b/dt_patches/dt_patch_test.sh @@ -102,6 +102,7 @@ run_test_local test_compiler_patch 2.12.16 run_test_local test_compiler_patch 2.12.17 run_test_local test_compiler_patch 2.12.18 run_test_local test_compiler_patch 2.12.19 +run_test_local test_compiler_patch 2.12.20 run_test_local test_compiler_patch 2.13.0 run_test_local test_compiler_patch 2.13.1 @@ -116,6 +117,7 @@ run_test_local test_compiler_patch 2.13.10 run_test_local test_compiler_patch 2.13.11 run_test_local test_compiler_patch 2.13.12 run_test_local test_compiler_patch 2.13.14 +run_test_local test_compiler_patch 2.13.15 run_test_local test_compiler_srcjar_error 2.12.11 run_test_local test_compiler_srcjar_error 2.12.12 @@ -129,7 +131,9 @@ run_test_local test_compiler_srcjar 2.12.16 run_test_local test_compiler_srcjar_nonhermetic 2.12.17 run_test_local test_compiler_srcjar_nonhermetic 2.12.18 run_test_local test_compiler_srcjar_nonhermetic 2.12.19 +run_test_local test_compiler_srcjar_nonhermetic 2.12.20 run_test_local test_compiler_srcjar_nonhermetic 2.13.11 run_test_local test_compiler_srcjar_nonhermetic 2.13.12 -run_test_local test_compiler_srcjar_nonhermetic 2.13.14 \ No newline at end of file +run_test_local test_compiler_srcjar_nonhermetic 2.13.14 +run_test_local test_compiler_srcjar_nonhermetic 2.13.15 \ No newline at end of file diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index ff0cb8f27..03517d2a0 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -105,6 +105,9 @@ srcjars_by_version = { "2.12.19": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.19/scala-compiler-2.12.19-sources.jar?foo", }, + "2.12.20": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.20/scala-compiler-2.12.20-sources.jar?foo", + }, "2.13.11": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo", }, @@ -114,6 +117,9 @@ srcjars_by_version = { "2.13.14": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14-sources.jar?foo", }, + "2.13.15": { + "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.15/scala-compiler-2.13.15-sources.jar?foo", + }, } rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION]) diff --git a/examples/crossbuild/1_single/BUILD b/examples/crossbuild/1_single/BUILD index fba6ac698..b39f59706 100644 --- a/examples/crossbuild/1_single/BUILD +++ b/examples/crossbuild/1_single/BUILD @@ -14,7 +14,7 @@ scala_library( scala_test( name = "test213", srcs = ["test.scala"], - scala_version = "2.13.14", + scala_version = "2.13.15", ) # This one will be compiled by 3.3 compiler (the default one): diff --git a/examples/crossbuild/2_deps/BUILD b/examples/crossbuild/2_deps/BUILD index b7ed66a2d..c39354498 100644 --- a/examples/crossbuild/2_deps/BUILD +++ b/examples/crossbuild/2_deps/BUILD @@ -19,7 +19,7 @@ scala_binary( name = "bin213", srcs = ["bin.scala"], # compiled with 2.13 (as per `scala_version`) main_class = "C", - scala_version = "2.13.14", + scala_version = "2.13.15", deps = [ ":lib", # compiled 2.13 (as per `scala_version`) ":lib211", # compiled with 2.11 (that target overrides version) diff --git a/examples/crossbuild/3_select/BUILD b/examples/crossbuild/3_select/BUILD index 314572089..c3a70479a 100644 --- a/examples/crossbuild/3_select/BUILD +++ b/examples/crossbuild/3_select/BUILD @@ -22,7 +22,7 @@ scala_binary( name = "bin2", srcs = ["bin.scala"], main_class = "B", - scala_version = "2.13.14", + scala_version = "2.13.15", deps = [":lib"], ) @@ -30,6 +30,6 @@ scala_binary( name = "bin3", srcs = ["bin.scala"], main_class = "B", - scala_version = "3.3.3", + scala_version = "3.3.4", deps = [":lib"], ) diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 2d0e286a8..8e7883e9b 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -30,11 +30,11 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.3.3", + scala_version = "3.3.4", scala_versions = [ "2.11.12", - "2.13.14", - "3.3.3", + "2.13.15", + "3.3.4", ], ) diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index 2e02cad76..fee68888c 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -29,7 +29,7 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "3.5.0") +scala_config(scala_version = "3.5.2") load( "@io_bazel_rules_scala//scala:scala.bzl", diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 456f76248..a006e5e94 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -32,7 +32,7 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "2.13.14") +scala_config(scala_version = "2.13.15") load( "@io_bazel_rules_scala//scala:scala.bzl", diff --git a/scala_config.bzl b/scala_config.bzl index 3bc114775..70cf132c3 100644 --- a/scala_config.bzl +++ b/scala_config.bzl @@ -2,7 +2,7 @@ load("//scala:scala_cross_version.bzl", "extract_major_version", "extract_minor_ def _default_scala_version(): """return the scala version for use in maven coordinates""" - return "2.12.19" + return "2.12.20" def _validate_supported_scala_version(scala_major_version, scala_minor_version): if scala_major_version == "2.11" and int(scala_minor_version) != 12: diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 675d16654..a0bb4df69 100644 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -12,7 +12,7 @@ import glob import os -root_scala_versions = ["2.11.12", "2.12.19", "2.13.14", "3.1.3", "3.2.2", "3.3.3", "3.4.3", "3.5.0"] +root_scala_versions = ["2.11.12", "2.12.20", "2.13.15", "3.1.3", "3.2.2", "3.3.4", "3.4.3", "3.5.2"] scala_test_version = "3.2.9" scala_fmt_version = "3.0.0" @@ -33,7 +33,7 @@ def select_root_artifacts(scala_version) -> List[str]: scala_major = ".".join(scala_version.split(".")[:2]) scala_test_major = "3" if scala_major >= "3.0" else scala_major scala_fmt_major = "2.13" if scala_major >= "3.0" else scala_major - kind_projector_version = "0.13.2" if scala_major < "2.13" else "0.13.3" + kind_projector_version = "0.13.2" if scala_major < "2.12" else "0.13.3" common_root_artifacts = [ f"org.scalatest:scalatest_{scala_test_major}:{scala_test_version}", @@ -104,7 +104,9 @@ def map_to_resolved_artifacts(output) -> List[ResolvedArtifact]: def resolve_artifacts_with_checksums_and_direct_dependencies(root_artifacts) -> List[ResolvedArtifact]: command = f'cs resolve {' '.join(root_artifacts)}' - output = subprocess.run(command, capture_output=True, text=True, shell=True).stdout.splitlines() + proc = subprocess.run(command, capture_output=True, text=True, shell=True) + print(proc.stderr) + output = proc.stdout.splitlines() return map_to_resolved_artifacts(output) def to_rules_scala_compatible_dict(artifacts, version) -> Dict[str, Dict]: diff --git a/test/diagnostics_reporter/DiagnosticsReporterTestCases3.java b/test/diagnostics_reporter/DiagnosticsReporterTestCases3.java index 6a995fdea..4b3c8ac43 100644 --- a/test/diagnostics_reporter/DiagnosticsReporterTestCases3.java +++ b/test/diagnostics_reporter/DiagnosticsReporterTestCases3.java @@ -21,10 +21,12 @@ class DiagnosticsReporterTestCases { put( "two_errors_file", new diagnostics_reporter.VerifyDiagnosticsOutput[] { + // 'did you mean' part was introduced in to Scala 3 LTS in 3.3.4 + // It was introduced in Scala Next releases somewhere beetween 3.4 and 3.5 new diagnostics_reporter.VerifyDiagnosticsOutput( - Diagnostics.Severity.ERROR, "Not found: printn"), + Diagnostics.Severity.ERROR, "Not found: printn - did you mean print? or perhaps printf or println?"), new diagnostics_reporter.VerifyDiagnosticsOutput( - Diagnostics.Severity.ERROR, "Not found: prinf") + Diagnostics.Severity.ERROR, "Not found: prinf - did you mean print? or perhaps printf?") }); put( "warning_file", @@ -37,7 +39,7 @@ class DiagnosticsReporterTestCases { new diagnostics_reporter.VerifyDiagnosticsOutput[] { // Scala 3 does not report unused import when errors are present new diagnostics_reporter.VerifyDiagnosticsOutput( - Diagnostics.Severity.ERROR, "Not found: printn") + Diagnostics.Severity.ERROR, "Not found: printn - did you mean print? or perhaps printf or println?") }); put( "info_file", diff --git a/test/shell/test_coverage_equals_in_target.sh b/test/shell/test_coverage_equals_in_target.sh index 2f37fa8e8..3dd3919e5 100755 --- a/test/shell/test_coverage_equals_in_target.sh +++ b/test/shell/test_coverage_equals_in_target.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_target_name_contains_equals_sign() { bazel coverage \ diff --git a/test/shell/test_coverage_scalatest.sh b/test/shell/test_coverage_scalatest.sh index e29b6adc2..f154dbb0d 100755 --- a/test/shell/test_coverage_scalatest.sh +++ b/test/shell/test_coverage_scalatest.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_on() { bazel coverage \ diff --git a/test/shell/test_coverage_scalatest_resources.sh b/test/shell/test_coverage_scalatest_resources.sh index 08bb38b74..0df3494ae 100755 --- a/test/shell/test_coverage_scalatest_resources.sh +++ b/test/shell/test_coverage_scalatest_resources.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_succeeds_resource_call() { bazel coverage \ diff --git a/test/shell/test_coverage_specs2_with_junit.sh b/test/shell/test_coverage_specs2_with_junit.sh index 725eecccd..940e00a3f 100755 --- a/test/shell/test_coverage_specs2_with_junit.sh +++ b/test/shell/test_coverage_specs2_with_junit.sh @@ -4,8 +4,8 @@ dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) . "${dir}"/test_helper.sh runner=$(get_test_runner "${1:-local}") -# Default to 2.12.19 for `diff` tests because other versions change the output. -SCALA_VERSION="${SCALA_VERSION:-2.12.19}" +# Default to 2.12.20 for `diff` tests because other versions change the output. +SCALA_VERSION="${SCALA_VERSION:-2.12.20}" test_coverage_on() { bazel coverage \ diff --git a/test/shell/test_examples.sh b/test/shell/test_examples.sh index d77568316..e485532cd 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.3 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.4 //..." } function scala3_4_example() { @@ -46,7 +46,7 @@ function scala3_4_example() { } function scala3_5_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.0 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.5.2 //..." } function semanticdb_example() { diff --git a/test/shell/test_invalid_scalacopts.sh b/test/shell/test_invalid_scalacopts.sh index 7108de058..eadd2293f 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.19 2.13.14 3.3.3; do +for scalaVersion in 2.12.20 2.13.15 3.3.4; 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_scala_config.sh b/test/shell/test_scala_config.sh index 4be645e58..ab17f661d 100755 --- a/test/shell/test_scala_config.sh +++ b/test/shell/test_scala_config.sh @@ -6,13 +6,13 @@ runner=$(get_test_runner "${1:-local}") test_classpath_contains_2_12() { bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \ - --repo_env=SCALA_VERSION=2.12.19 \ + --repo_env=SCALA_VERSION=2.12.20 \ | grep scala-library-2.12 } test_classpath_contains_2_13() { bazel aquery 'mnemonic("Javac", //src/java/io/bazel/rulesscala/scalac:scalac)' \ - --repo_env=SCALA_VERSION=2.13.14 \ + --repo_env=SCALA_VERSION=2.13.15 \ | grep scala-library-2.13 } diff --git a/test/shell/test_semanticdb.sh b/test/shell/test_semanticdb.sh index 89947160e..6adffc448 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.3" + local version_opt="--repo_env=SCALA_VERSION=3.3.4" fi diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index cb3f9d338..445e5de00 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -63,11 +63,11 @@ scala_config( scala_version = "3.1.3", scala_versions = [ "2.11.12", - "2.12.19", - "2.13.14", + "2.12.20", + "2.13.15", "3.1.3", "3.2.2", - "3.3.3", + "3.3.4", ], ) diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD index 586619277..802c8481b 100644 --- a/test_cross_build/scalafmt/BUILD +++ b/test_cross_build/scalafmt/BUILD @@ -20,7 +20,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.13.14", + scala_version = "2.13.15", ) scalafmt_scala_library( @@ -28,7 +28,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.13.14", + scala_version = "2.13.15", ) scalafmt_scala_library( @@ -36,7 +36,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.3", + scala_version = "3.3.4", ) scalafmt_scala_library( @@ -44,7 +44,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.3", + scala_version = "3.3.4", ) scalafmt_scala_binary( @@ -53,7 +53,7 @@ scalafmt_scala_binary( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_library( @@ -62,7 +62,7 @@ scalafmt_scala_library( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_binary( @@ -88,7 +88,7 @@ scalafmt_scala_test( srcs = ["unformatted/unformatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.19", + scala_version = "2.12.20", ) scalafmt_scala_test( @@ -96,7 +96,7 @@ scalafmt_scala_test( srcs = ["formatted/formatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.19", + scala_version = "2.12.20", ) #default scala version is 3.1.3 diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD index e9401a760..4eb341972 100644 --- a/test_cross_build/version_specific/BUILD +++ b/test_cross_build/version_specific/BUILD @@ -7,7 +7,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library") scala_library( name = "since_3_3", srcs = ["since_3_3.scala"], - scala_version = "3.3.3", + scala_version = "3.3.4", ) scala_library( @@ -43,7 +43,7 @@ scala_library( "since_3_2.scala", "since_3_3.scala", ], - scala_version = "3.3.3", + scala_version = "3.3.4", ) scala_library( diff --git a/test_version.sh b/test_version.sh index 98c0a0770..753cd7498 100755 --- a/test_version.sh +++ b/test_version.sh @@ -3,9 +3,9 @@ set -e scala_2_11_version="2.11.12" -scala_2_12_version="2.12.19" -scala_2_13_version="2.13.14" -scala_3_version="3.3.3" +scala_2_12_version="2.12.20" +scala_2_13_version="2.13.15" +scala_3_version="3.3.4" SCALA_VERSION_DEFAULT=$scala_2_11_version diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index 241173da5..c3d4f1cc4 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -1,13 +1,13 @@ -scala_version = "2.12.19" +scala_version = "2.12.20" artifacts = { "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala-library:2.12.19", - "sha256": "81e32f8e31236ef84c21287f1fbaa916fc6525b2e63220d4a0f2396e91871d50", + "artifact": "org.scala-lang:scala-library:2.12.20", + "sha256": "4d8a8f984cce31a329a24f10b0bf336f042cb62aeb435290a1b20243154cfccb", }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala-compiler:2.12.19", - "sha256": "d12975f4cf9a450ea12870243648a851f92165448fdda5a292747cb3bdaecc4f", + "artifact": "org.scala-lang:scala-compiler:2.12.20", + "sha256": "c88676d75c69721b717ea6c441ece04fff262abab9d210a2936abc2be3731fa2", "deps": [ "@io_bazel_rules_scala_scala_xml", "@io_bazel_rules_scala_scala_library", @@ -15,8 +15,8 @@ artifacts = { ], }, "io_bazel_rules_scala_scala_reflect": { - "artifact": "org.scala-lang:scala-reflect:2.12.19", - "sha256": "ff6eaa5548779d61d35b98cb25e931951c5a9f1abc48741e9df95324ee2ae66c", + "artifact": "org.scala-lang:scala-reflect:2.12.20", + "sha256": "5f1914cdc7a70580ea6038d929ebb25736ecf2234f677e2d47f8a4b2bc81e1fb", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -134,8 +134,8 @@ artifacts = { ], }, "io_bazel_rules_scala_scala_xml": { - "artifact": "org.scala-lang.modules:scala-xml_2.12:2.2.0", - "sha256": "fd92f78b7acfea72999aceba5b377a000f42f9296d3d98224c9b1c471815582f", + "artifact": "org.scala-lang.modules:scala-xml_2.12:2.3.0", + "sha256": "4932c56a2d5aae77ae8d7ac6bed1f21d48268fdbac8b4e5f3ca5196ad10fd93e", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -153,8 +153,8 @@ artifacts = { ], }, "org_scalameta_semanticdb_scalac": { - "artifact": "org.scalameta:semanticdb-scalac_2.12.19:4.9.9", - "sha256": "566a6b2c38100df99e7f3cf911a965556f3055e28ebb3caea04cef23eb7307d0", + "artifact": "org.scalameta:semanticdb-scalac_2.12.20:4.9.9", + "sha256": "7f0e44262b2b1003668f2f51eb0f978ed5a4b94f734e3a6138ce9d7d1a40fc83", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -581,8 +581,8 @@ artifacts = { }, "org_typelevel_kind_projector": { "testonly": True, - "artifact": "org.typelevel:kind-projector_2.12.19:0.13.2", - "sha256": "7d4e821b86647c65546c1e3667348e8168c5907e9d4b277cc2badedcd479be44", + "artifact": "org.typelevel:kind-projector_2.12.20:0.13.3", + "sha256": "98a53122dedd51f79f23ae03eae3258a2e5dbd51c647eaea4942f98c55b052d1", "deps": [ "@io_bazel_rules_scala_scala_compiler", "@io_bazel_rules_scala_scala_library", diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 08df1ca8b..ac474f7f1 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -1,21 +1,21 @@ -scala_version = "2.13.14" +scala_version = "2.13.15" artifacts = { "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala-library:2.13.14", - "sha256": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3", + "artifact": "org.scala-lang:scala-library:2.13.15", + "sha256": "8e4dbc3becf70d59c787118f6ad06fab6790136a0699cd6412bc9da3d336944e", }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala-compiler:2.13.14", - "sha256": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6", + "artifact": "org.scala-lang:scala-compiler:2.13.15", + "sha256": "4c200cd193c082bec14a2a2dffe6a1ba5f8130b1b27c79ee54c936dfcafc8ed9", "deps": [ "@io_bazel_rules_scala_scala_library", "@io_bazel_rules_scala_scala_reflect", ], }, "io_bazel_rules_scala_scala_reflect": { - "artifact": "org.scala-lang:scala-reflect:2.13.14", - "sha256": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926", + "artifact": "org.scala-lang:scala-reflect:2.13.15", + "sha256": "78d0cc350e1ee42d87c6e11cf5b0dc7bf0b70829c00aa38f27bfb019d439dc11", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -159,8 +159,8 @@ artifacts = { ], }, "org_scalameta_semanticdb_scalac": { - "artifact": "org.scalameta:semanticdb-scalac_2.13.14:4.9.9", - "sha256": "c5269b5b7264fc5082357acdb4d9cf6790f49b4195f127878bd4f46659e3c52b", + "artifact": "org.scalameta:semanticdb-scalac_2.13.15:4.9.9", + "sha256": "409194fee7eeb3da25733f6fc0c2d62b9ef53ddecdc50b6c922fdc695b250fe7", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -588,7 +588,7 @@ artifacts = { }, "org_typelevel_kind_projector": { "testonly": True, - "artifact": "org.typelevel:kind-projector_2.13.14:0.13.3", + "artifact": "org.typelevel:kind-projector_2.13.15:0.13.3", "sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92", "deps": [ "@io_bazel_rules_scala_scala_compiler", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 719c97e21..7d36043fd 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -1,4 +1,4 @@ -scala_version = "3.3.3" +scala_version = "3.3.4" artifacts = { "io_bazel_rules_scala_scala_library_2": { @@ -6,30 +6,31 @@ artifacts = { "sha256": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1", }, "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala3-library_3:3.3.3", - "sha256": "16fe064f1373ed6f098d3d9f812a398ed5075db4bf2721c04e630502cb352816", + "artifact": "org.scala-lang:scala3-library_3:3.3.4", + "sha256": "d95184acfcd814da2e051378e4962c653f4b468f4086452ab427af030482bd3c", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala3-compiler_3:3.3.3", - "sha256": "f22bd99272f7634919b926f778be19a447e7d0c1e96e5b8ab460f287cffe1f5c", + "artifact": "org.scala-lang:scala3-compiler_3:3.3.4", + "sha256": "2cca65fdb92e2cc393786cae61b4f7bcb9032ad4be61f9cebae1dca72997e52f", "deps": [ "@io_bazel_rules_scala_scala_asm", + "@org_scala_sbt_compiler_interface", ], }, "io_bazel_rules_scala_scala_interfaces": { - "artifact": "org.scala-lang:scala3-interfaces:3.3.3", - "sha256": "9d85768663a1894eb9c7cfb73befe16eca760d536eed441f6660a5b8e8dc0c6a", + "artifact": "org.scala-lang:scala3-interfaces:3.3.4", + "sha256": "fe056c10a217353e14aa62076d2bbd957ebd82e02fb445ca5546ae8ea9d40caa", }, "io_bazel_rules_scala_scala_tasty_core": { - "artifact": "org.scala-lang:tasty-core_3:3.3.3", - "sha256": "a126a3a76022beeb9133e7a7400b81a5ce6910f7866cc5e84fa8133ca90784a5", + "artifact": "org.scala-lang:tasty-core_3:3.3.4", + "sha256": "13d44693d6f2d38e0595954d11234c0373d6d0e689a8151b06878c5b631d57d5", }, "io_bazel_rules_scala_scala_asm": { - "artifact": "org.scala-lang.modules:scala-asm:9.5.0-scala-1", - "sha256": "fa582f7352f5ee5c244d7fe93c2a1d95dada2d281e1af9a535f0b5153c75088c", + "artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1", + "sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12", }, "io_bazel_rules_scala_scala_parallel_collections": { "artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3", @@ -143,8 +144,8 @@ artifacts = { ], }, "org_scala_sbt_compiler_interface": { - "artifact": "org.scala-sbt:compiler-interface:1.10.1", - "sha256": "6f9982aea22fa17fef0315abd6925940dbf57fa7033535ad2176aba240aeaa1d", + "artifact": "org.scala-sbt:compiler-interface:1.9.6", + "sha256": "b986ad1cfcef14c8abeaa3e788df28be9150acfbf587b5f7aa92c1b043c4fa8d", }, "org_scalameta_fastparse": { "artifact": "org.scalameta:fastparse-v2_2.13:2.3.1", diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index f5f558b85..0c9490508 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -1,4 +1,4 @@ -scala_version = "3.5.0" +scala_version = "3.5.2" artifacts = { "io_bazel_rules_scala_scala_library_2": { @@ -6,31 +6,31 @@ artifacts = { "sha256": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1", }, "io_bazel_rules_scala_scala_library": { - "artifact": "org.scala-lang:scala3-library_3:3.5.0", - "sha256": "242c9a005b356c9554c6e5f33c2b40eb015f62755e1ea5c5613d80c488d40860", + "artifact": "org.scala-lang:scala3-library_3:3.5.2", + "sha256": "3d1117bb660d3721d2a01345e064d96fd6eca5e7a4e574eecaa409c064432cba", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "io_bazel_rules_scala_scala_compiler": { - "artifact": "org.scala-lang:scala3-compiler_3:3.5.0", - "sha256": "54842fab4554c10d857b5617a7855107c8b0134a49d298c6b4e2d9f1584e7049", + "artifact": "org.scala-lang:scala3-compiler_3:3.5.2", + "sha256": "ba6b31f2d63048d5e4bac45facf42811da2093ae60e90932ab72778e439243b2", "deps": [ "@io_bazel_rules_scala_scala_asm", "@org_scala_sbt_compiler_interface", ], }, "io_bazel_rules_scala_scala_interfaces": { - "artifact": "org.scala-lang:scala3-interfaces:3.5.0", - "sha256": "2cb0d101eef1d9d21e74177d419dfaa8e84515ab0a07f6c5f650d61d22e3c9cb", + "artifact": "org.scala-lang:scala3-interfaces:3.5.2", + "sha256": "36bb7c369bfd245dce403c886e1f004a574d0b7935d50cf5a9bf6ddefd1d2b0e", }, "io_bazel_rules_scala_scala_tasty_core": { - "artifact": "org.scala-lang:tasty-core_3:3.5.0", - "sha256": "47e8323b16b4b76e49d4dd3756e53b1fefebea91a5624ac20bf045cefd211904", + "artifact": "org.scala-lang:tasty-core_3:3.5.2", + "sha256": "b380158748e147f4e44654ad16003c89599ddd456eac29f9686cb6d5515067f3", }, "io_bazel_rules_scala_scala_asm": { - "artifact": "org.scala-lang.modules:scala-asm:9.6.0-scala-1", - "sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12", + "artifact": "org.scala-lang.modules:scala-asm:9.7.0-scala-2", + "sha256": "823cd3a46e289c69e37994e03aee3864e1e059aacb3e0bf34f536b3669b61772", }, "io_bazel_rules_scala_scala_parallel_collections": { "artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3",