From 6613ffce57bcdb3035264a737eddfbf6d36b39dc Mon Sep 17 00:00:00 2001 From: lm1nrt <83814747+lm1nrt@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:26:09 +0200 Subject: [PATCH 1/2] Updated artifact versions with sha sums and scala versions (#1597) * bumped artifact versions with sha sums and scala versions * reset cla * removed library version update * update sha sums * update scala version in workspace * update scala version in workspace and build * update scala version in workspaces and build * removed scalafmt updated versions * removed docs update * removed support for 3.4.2 due to failing scala3_4_example * removed support for 3.4.2 due to failing scala3_4_example * lint issue * update --- .bazelci/presubmit.yml | 4 ++-- README.md | 6 ++--- dt_patches/dt_patch_test.sh | 6 ++++- .../test_dt_patches_user_srcjar/WORKSPACE | 6 +++++ examples/crossbuild/1_single/BUILD | 2 +- examples/crossbuild/2_deps/BUILD | 2 +- examples/crossbuild/3_select/BUILD | 4 ++-- examples/crossbuild/WORKSPACE | 6 ++--- examples/scala3/WORKSPACE | 2 +- examples/semanticdb/WORKSPACE | 2 +- scala_config.bzl | 2 +- test/shell/test_examples.sh | 6 ++--- test/shell/test_scala_config.sh | 4 ++-- test/shell/test_semanticdb.sh | 2 +- test_cross_build/WORKSPACE | 12 +++++----- test_cross_build/scalafmt/BUILD | 22 +++++++++---------- test_cross_build/version_specific/BUILD | 16 +++++++------- test_version.sh | 4 ++-- third_party/repositories/scala_2_12.bzl | 16 +++++++------- third_party/repositories/scala_2_13.bzl | 16 +++++++------- third_party/repositories/scala_3_1.bzl | 10 ++++----- third_party/repositories/scala_3_2.bzl | 10 ++++----- third_party/repositories/scala_3_3.bzl | 10 ++++----- 23 files changed, 90 insertions(+), 80 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index f02262cfb..7556ffcb6 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -27,7 +27,7 @@ tasks: platform: ubuntu2004 shell_commands: # Install xmllint - - sudo apt update && sudo apt install -y libxml2-utils + - sudo apt update && sudo apt install --reinstall libxml2-utils -y - "./test_rules_scala.sh" test_rules_scala_linux_last_green: name: "./test_rules_scala (Bazel green head)" @@ -35,7 +35,7 @@ tasks: bazel: last_green shell_commands: # Install xmllint - - sudo apt update && sudo apt install -y libxml2-utils + - sudo apt update && sudo apt install --reinstall libxml2-utils -y - "./test_rules_scala.sh || buildkite-agent annotate --style 'warning' \"Optional build with latest Bazel version failed, [see here](${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}) (It is not mandatory but worth checking)\"" test_rules_scala_macos: name: "./test_rules_scala" diff --git a/README.md b/README.md index e5ac65ff0..269aa4999 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.18) +`rules_scala_version` into your Bazel project and register a [scala_toolchain](docs/scala_toolchain.md) at the default Scala version (2.12.19) 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.18` and `2.13.12` versions. +dependency providers configured for `2.11.12`, `2.12.19` and `2.13.14` versions. ```starlark # WORKSPACE load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "2.13.12") +scala_config(scala_version = "2.13.14") 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 8d14bee2f..7bd9e89d9 100755 --- a/dt_patches/dt_patch_test.sh +++ b/dt_patches/dt_patch_test.sh @@ -101,6 +101,7 @@ run_test_local test_compiler_patch 2.12.15 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.13.0 run_test_local test_compiler_patch 2.13.1 @@ -114,6 +115,7 @@ run_test_local test_compiler_patch 2.13.8 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_srcjar_error 2.12.11 run_test_local test_compiler_srcjar_error 2.12.12 @@ -126,6 +128,8 @@ run_test_local test_compiler_srcjar 2.12.15 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.13.11 -run_test_local test_compiler_srcjar_nonhermetic 2.13.12 \ No newline at end of file +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 diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 0ba7a41ce..92af9eaac 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -91,12 +91,18 @@ srcjars_by_version = { "2.12.18": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.18/scala-compiler-2.12.18-sources.jar?foo", }, + "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.13.11": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo", }, "2.13.12": { "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.12/scala-compiler-2.13.12-sources.jar?foo", }, + "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", + }, } 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 42e14517a..fba6ac698 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.12", + scala_version = "2.13.14", ) # 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 ff04ca111..b7ed66a2d 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.12", + scala_version = "2.13.14", 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 2e58b6ff4..314572089 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.12", + scala_version = "2.13.14", deps = [":lib"], ) @@ -30,6 +30,6 @@ scala_binary( name = "bin3", srcs = ["bin.scala"], main_class = "B", - scala_version = "3.3.1", + scala_version = "3.3.3", deps = [":lib"], ) diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 0df5e8335..4711fc376 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -19,11 +19,11 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.3.1", + scala_version = "3.3.3", scala_versions = [ "2.11.12", - "2.13.12", - "3.3.1", + "2.13.14", + "3.3.3", ], ) diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index b235319df..2137d4009 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -18,7 +18,7 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "3.3.1") +scala_config(scala_version = "3.3.3") load( "@io_bazel_rules_scala//scala:scala.bzl", diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index d569fcf4c..99b58d10b 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -21,7 +21,7 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -scala_config(scala_version = "2.13.12") +scala_config(scala_version = "2.13.14") load( "@io_bazel_rules_scala//scala:scala.bzl", diff --git a/scala_config.bzl b/scala_config.bzl index 699c93a6b..3bc114775 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.18" + return "2.12.19" 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/test/shell/test_examples.sh b/test/shell/test_examples.sh index 23f36f874..c861c2659 100755 --- a/test/shell/test_examples.sh +++ b/test/shell/test_examples.sh @@ -30,15 +30,15 @@ function multi_framework_toolchain_example() { } function scala3_1_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.1.0 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.1.3 //..." } function scala3_2_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.2.1 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.2.2 //..." } function scala3_3_example() { - test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.1 //..." + test_example examples/scala3 "bazel build --repo_env=SCALA_VERSION=3.3.3 //..." } function semanticdb_example() { diff --git a/test/shell/test_scala_config.sh b/test/shell/test_scala_config.sh index 88870f8ea..53d20aeda 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.18 \ + --repo_env=SCALA_VERSION=2.12.19 \ | 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.12 \ + --repo_env=SCALA_VERSION=2.13.14 \ | grep scala-library-2.13 } diff --git a/test/shell/test_semanticdb.sh b/test/shell/test_semanticdb.sh index 351162f09..b452573d7 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.1" + local version_opt="--repo_env=SCALA_VERSION=3.3.3" fi diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index e069134f8..1dc58574c 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -35,14 +35,14 @@ local_repository( load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") scala_config( - scala_version = "3.1.0", + scala_version = "3.1.3", scala_versions = [ "2.11.12", - "2.12.18", - "2.13.12", - "3.1.0", - "3.2.1", - "3.3.1", + "2.12.19", + "2.13.14", + "3.1.3", + "3.2.2", + "3.3.3", ], ) diff --git a/test_cross_build/scalafmt/BUILD b/test_cross_build/scalafmt/BUILD index 848a5c9c5..586619277 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.12", + scala_version = "2.13.14", ) scalafmt_scala_library( @@ -28,7 +28,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.13.12", + scala_version = "2.13.14", ) scalafmt_scala_library( @@ -36,7 +36,7 @@ scalafmt_scala_library( srcs = ["unformatted/unformatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.1", + scala_version = "3.3.3", ) scalafmt_scala_library( @@ -44,7 +44,7 @@ scalafmt_scala_library( srcs = ["formatted/formatted-library3.scala"], config = ":scala3-conf", format = True, - scala_version = "3.3.1", + scala_version = "3.3.3", ) scalafmt_scala_binary( @@ -53,7 +53,7 @@ scalafmt_scala_binary( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.18", + scala_version = "2.12.19", ) scalafmt_scala_library( @@ -62,7 +62,7 @@ scalafmt_scala_library( config = ":scala2-conf", format = True, main_class = "UnformattedBinary", - scala_version = "2.12.18", + scala_version = "2.12.19", ) scalafmt_scala_binary( @@ -71,7 +71,7 @@ scalafmt_scala_binary( config = ":scala3-conf", format = True, main_class = "UnformattedBinary", - scala_version = "3.2.1", + scala_version = "3.2.2", ) scalafmt_scala_library( @@ -80,7 +80,7 @@ scalafmt_scala_library( config = ":scala3-conf", format = True, main_class = "UnformattedBinary", - scala_version = "3.2.1", + scala_version = "3.2.2", ) scalafmt_scala_test( @@ -88,7 +88,7 @@ scalafmt_scala_test( srcs = ["unformatted/unformatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.18", + scala_version = "2.12.19", ) scalafmt_scala_test( @@ -96,10 +96,10 @@ scalafmt_scala_test( srcs = ["formatted/formatted-test2.scala"], config = ":scala2-conf", format = True, - scala_version = "2.12.18", + scala_version = "2.12.19", ) -#default scala version is 3.1.0 +#default scala version is 3.1.3 scalafmt_scala_test( name = "unformatted-test3", srcs = ["unformatted/unformatted-test3.scala"], diff --git a/test_cross_build/version_specific/BUILD b/test_cross_build/version_specific/BUILD index facf8dbda..e9401a760 100644 --- a/test_cross_build/version_specific/BUILD +++ b/test_cross_build/version_specific/BUILD @@ -7,33 +7,33 @@ 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.1", + scala_version = "3.3.3", ) scala_library( name = "before_3_3", srcs = ["before_3_3.scala"], - scala_version = "3.2.1", + scala_version = "3.2.2", ) # What's new in 3.2 scala_library( name = "since_3_2", srcs = ["since_3_2.scala"], - scala_version = "3.2.1", + scala_version = "3.2.2", ) scala_library( name = "before_3_2", srcs = ["before_3_2.scala"], - scala_version = "3.1.0", + scala_version = "3.1.3", ) # What's new in 3.1 scala_library( name = "since_3_1", srcs = ["since_3_1.scala"], - scala_version = "3.1.0", + scala_version = "3.1.3", ) scala_library( @@ -43,7 +43,7 @@ scala_library( "since_3_2.scala", "since_3_3.scala", ], - scala_version = "3.3.1", + scala_version = "3.3.3", ) scala_library( @@ -53,7 +53,7 @@ scala_library( "since_3_1.scala", "since_3_2.scala", ], - scala_version = "3.2.1", + scala_version = "3.2.2", ) scala_library( @@ -63,5 +63,5 @@ scala_library( "before_3_3.scala", "since_3_1.scala", ], - scala_version = "3.1.0", + scala_version = "3.1.3", ) diff --git a/test_version.sh b/test_version.sh index 549e3cdaf..fab99c78c 100755 --- a/test_version.sh +++ b/test_version.sh @@ -3,8 +3,8 @@ set -e scala_2_11_version="2.11.12" -scala_2_12_version="2.12.18" -scala_2_13_version="2.13.12" +scala_2_12_version="2.12.19" +scala_2_13_version="2.13.14" 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 bf72fa488..6e56827d6 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -1,17 +1,17 @@ -scala_version = "2.12.18" +scala_version = "2.12.19" artifacts = { "io_bazel_rules_scala_scala_library": { "artifact": "org.scala-lang:scala-library:%s" % scala_version, - "sha256": "e51e6636c003359e106bea4ad99def70e613c290190c8c84f10f9560dd5b00ae", + "sha256": "81e32f8e31236ef84c21287f1fbaa916fc6525b2e63220d4a0f2396e91871d50", }, "io_bazel_rules_scala_scala_compiler": { "artifact": "org.scala-lang:scala-compiler:%s" % scala_version, - "sha256": "5680cee34200e8d8ed7965c71d8b1428d3eeb889eb14fec38d40ffbc3761a0d0", + "sha256": "d12975f4cf9a450ea12870243648a851f92165448fdda5a292747cb3bdaecc4f", }, "io_bazel_rules_scala_scala_reflect": { "artifact": "org.scala-lang:scala-reflect:%s" % scala_version, - "sha256": "d6a24e175246541ffcbc965a231aa1d3bb01d61def196f91495690fabf9783bc", + "sha256": "ff6eaa5548779d61d35b98cb25e931951c5a9f1abc48741e9df95324ee2ae66c", }, "io_bazel_rules_scala_scalatest": { "artifact": "org.scalatest:scalatest_2.12:3.2.9", @@ -78,8 +78,8 @@ artifacts = { ], }, "org_scalameta_semanticdb_scalac": { - "artifact": "org.scalameta:semanticdb-scalac_%s:4.8.4" % scala_version, - "sha256": "11d28a73d182453454451aef4768462730f8c3e369df47b224a4ff2e943f1db7", + "artifact": "org.scalameta:semanticdb-scalac_%s:4.9.9" % scala_version, + "sha256": "566a6b2c38100df99e7f3cf911a965556f3055e28ebb3caea04cef23eb7307d0", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -508,7 +508,7 @@ artifacts = { }, "org_typelevel_kind_projector": { "testonly": True, - "artifact": "org.typelevel:kind-projector_%s:0.13.2" % scala_version, - "sha256": "7d4e821b86647c65546c1e3667348e8168c5907e9d4b277cc2badedcd479be44", + "artifact": "org.typelevel:kind-projector_%s:0.13.3" % scala_version, + "sha256": "98a53122dedd51f79f23ae03eae3258a2e5dbd51c647eaea4942f98c55b052d1", }, } diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 1864c5241..4b5e368fb 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -1,17 +1,17 @@ -scala_version = "2.13.12" +scala_version = "2.13.14" artifacts = { "io_bazel_rules_scala_scala_library": { "artifact": "org.scala-lang:scala-library:%s" % scala_version, - "sha256": "c6a879e4973a60f6162668542a33eaccc2bb565d1c934fb061c5844259131dd1", + "sha256": "43e0ca1583df1966eaf02f0fbddcfb3784b995dd06bfc907209347758ce4b7e3", }, "io_bazel_rules_scala_scala_compiler": { "artifact": "org.scala-lang:scala-compiler:%s" % scala_version, - "sha256": "583adb1ffa7b29fdbfdd6f4c97a396af06a8a91625d059823bba1b7172242d6a", + "sha256": "17b7e1dd95900420816a3bc2788c8c7358c2a3c42899765a5c463a46bfa569a6", }, "io_bazel_rules_scala_scala_reflect": { "artifact": "org.scala-lang:scala-reflect:%s" % scala_version, - "sha256": "c648ceb93a9fcbd22603e0be3d6a156723ae661f516c772a550a088bb3cbca7a", + "sha256": "8846baaa8cf43b1b19725ab737abff145ca58d14a4d02e75d71ca8f7ca5f2926", }, "io_bazel_rules_scala_scala_parallel_collections": { "artifact": "org.scala-lang.modules:scala-parallel-collections_2.13:1.0.3", @@ -82,8 +82,8 @@ artifacts = { ], }, "org_scalameta_semanticdb_scalac": { - "artifact": "org.scalameta:semanticdb-scalac_%s:4.8.4" % scala_version, - "sha256": "119657e06e82d9337ce643f1cfd2633ce1be001157b82555f67859a784745967", + "artifact": "org.scalameta:semanticdb-scalac_%s:4.9.9" % scala_version, + "sha256": "c5269b5b7264fc5082357acdb4d9cf6790f49b4195f127878bd4f46659e3c52b", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -513,7 +513,7 @@ artifacts = { }, "org_typelevel_kind_projector": { "testonly": True, - "artifact": "org.typelevel:kind-projector_%s:0.13.2" % scala_version, - "sha256": "4bd985e53ac950a1f130981f7ec9a2c5dffe4c2f588fc695180c6105f4a9557f", + "artifact": "org.typelevel:kind-projector_%s:0.13.3" % scala_version, + "sha256": "569fec54deba82cd143f05a6a0456c9e3bf56bff310b0968f0adb5fb3b352d92", }, } diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index 765f1f196..f31a09f85 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -1,4 +1,4 @@ -scala_version = "3.1.0" +scala_version = "3.1.3" artifacts = { "io_bazel_rules_scala_scala_library_2": { @@ -7,22 +7,22 @@ artifacts = { }, "io_bazel_rules_scala_scala_library": { "artifact": "org.scala-lang:scala3-library_3:%s" % scala_version, - "sha256": "5b513c97181d22c393cf32a51902fce27b9f698d246c7a92df7775f0bb04bec0", + "sha256": "1ac79970d94a1762ce6af4208820b4fa4c70093409decaad85c69d8b5f46e422", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "io_bazel_rules_scala_scala_compiler": { "artifact": "org.scala-lang:scala3-compiler_3:%s" % scala_version, - "sha256": "9a76c166c97db534afb51861d234430a732158bdb413d8e12425e8c72457db60", + "sha256": "140c7bc825b9df3cb69a093adc4f11f7f0992f1fa87bae10d16e89020fe03e82", }, "io_bazel_rules_scala_scala_interfaces": { "artifact": "org.scala-lang:scala3-interfaces:%s" % scala_version, - "sha256": "0e344029ace7b1a846aa77e5cd452b7c8a28726b12b7c2baec0a70a038a686e9", + "sha256": "dca9bcd395deffca77c1d3919b4cc998234025059a892b10c3674c9a37d6dc9f", }, "io_bazel_rules_scala_scala_tasty_core": { "artifact": "org.scala-lang:tasty-core_3:%s" % scala_version, - "sha256": "80c9d1ac1630a22b3b62e0d482f91552397be22eac3ea0e61104c5ca67287647", + "sha256": "0a183e880575bcc97a2047761880241784734e7ee094dc6fafd6a8f2109ff1da", }, "io_bazel_rules_scala_scala_asm": { "artifact": "org.scala-lang.modules:scala-asm:9.1.0-scala-1", diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index d0ae2dc3f..415fe58e9 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -1,4 +1,4 @@ -scala_version = "3.2.1" +scala_version = "3.2.2" artifacts = { "io_bazel_rules_scala_scala_library_2": { @@ -7,22 +7,22 @@ artifacts = { }, "io_bazel_rules_scala_scala_library": { "artifact": "org.scala-lang:scala3-library_3:%s" % scala_version, - "sha256": "509669b30249e2b34a8488c9d1de7b978c9524c71712f1e2c8db2a516bc71266", + "sha256": "f96317c57a5beae2cb16607d2b99cba7b136a96416e736966e5955e6608d868b", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "io_bazel_rules_scala_scala_compiler": { "artifact": "org.scala-lang:scala3-compiler_3:%s" % scala_version, - "sha256": "bde05ca98bd7b681806eeda39524638d5cf0403254ca089d96a6d666eec5e66d", + "sha256": "4b350ee6f6bc5b33f882f0ade788fac930e0f99285bb08d996f59946f8d3889a", }, "io_bazel_rules_scala_scala_interfaces": { "artifact": "org.scala-lang:scala3-interfaces:%s" % scala_version, - "sha256": "5ceb45f9e2a2c56e4759cd96c9f4d097c3f07c1f9f6409990731f85733bbbef3", + "sha256": "f07bab6250d718613f0f8250cc61cc23217c4fd84c410c3af43b8098fff31f69", }, "io_bazel_rules_scala_scala_tasty_core": { "artifact": "org.scala-lang:tasty-core_3:%s" % scala_version, - "sha256": "2a7745396ba0ad90344f2dc9645123c6e2d568666668be7af9de0bee9898b933", + "sha256": "df0690721532323a3c533385a06a4f532231d012d38f65bd75864718cfabace4", }, "io_bazel_rules_scala_scala_asm": { "artifact": "org.scala-lang.modules:scala-asm:9.1.0-scala-1", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 7d5105955..a3ce32122 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.1" +scala_version = "3.3.3" artifacts = { "io_bazel_rules_scala_scala_library_2": { @@ -7,22 +7,22 @@ artifacts = { }, "io_bazel_rules_scala_scala_library": { "artifact": "org.scala-lang:scala3-library_3:%s" % scala_version, - "sha256": "b64c13c1f3d1ac2323457ec6cc09e9b38d7a9ef6889a1a0063601bf25d545508", + "sha256": "16fe064f1373ed6f098d3d9f812a398ed5075db4bf2721c04e630502cb352816", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "io_bazel_rules_scala_scala_compiler": { "artifact": "org.scala-lang:scala3-compiler_3:%s" % scala_version, - "sha256": "da070033d637a405a14cfe8ef8a16a792166e175f88f2c9f32b9a5cd403e5130", + "sha256": "f22bd99272f7634919b926f778be19a447e7d0c1e96e5b8ab460f287cffe1f5c", }, "io_bazel_rules_scala_scala_interfaces": { "artifact": "org.scala-lang:scala3-interfaces:%s" % scala_version, - "sha256": "da9741cc37def9111174befa2beb1672d81b9b3d7403f54ad875a5d40ae430c5", + "sha256": "9d85768663a1894eb9c7cfb73befe16eca760d536eed441f6660a5b8e8dc0c6a", }, "io_bazel_rules_scala_scala_tasty_core": { "artifact": "org.scala-lang:tasty-core_3:%s" % scala_version, - "sha256": "921027ca6a3f0cfac3b20fcadfea613558b4e6e607c1cc247ab4a05a62af3965", + "sha256": "a126a3a76022beeb9133e7a7400b81a5ce6910f7866cc5e84fa8133ca90784a5", }, "io_bazel_rules_scala_scala_asm": { "artifact": "org.scala-lang.modules:scala-asm:9.1.0-scala-1", From ac4181c71bd6e7ad1f564c88405c18c60e365b0f Mon Sep 17 00:00:00 2001 From: Joel Jeske Date: Mon, 26 Aug 2024 03:36:29 -0500 Subject: [PATCH 2/2] [bugfix] normalize paths to enable running external tests (#1598) --- src/java/io/bazel/rulesscala/scala_test/Runner.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/io/bazel/rulesscala/scala_test/Runner.java b/src/java/io/bazel/rulesscala/scala_test/Runner.java index 905a0b60f..134181b70 100644 --- a/src/java/io/bazel/rulesscala/scala_test/Runner.java +++ b/src/java/io/bazel/rulesscala/scala_test/Runner.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Map; @@ -48,7 +49,9 @@ private static String[] extendFromFileArgs(String[] args) throws IOException { if (workspace == null || workspace.trim().isEmpty()) throw new IllegalArgumentException(RULES_SCALA_MAIN_WS_NAME + " is null or empty."); - String runnerArgsFilePath = Runfiles.create().rlocation(workspace + "/" + runnerArgsFileKey); + + Path runnerArgsUnresolvedFileLocation = Paths.get(workspace + "/" + runnerArgsFileKey).normalize(); + String runnerArgsFilePath = Runfiles.create().rlocation(runnerArgsUnresolvedFileLocation.toString()); if (runnerArgsFilePath == null) throw new IllegalArgumentException("rlocation value is null for key: " + runnerArgsFileKey); @@ -90,7 +93,8 @@ private static void rlocateRunpathValue(String rulesWorkspace, List runn String[] runpathElements = runnerArgs.get(runpathFlag + 1).split(File.pathSeparator); Runfiles runfiles = Runfiles.create(); for (int i = 0; i < runpathElements.length; i++) { - runpathElements[i] = runfiles.rlocation(rulesWorkspace + "/" + runpathElements[i]); + Path runPathElementPath = Paths.get(rulesWorkspace + "/" + runpathElements[i]).normalize(); + runpathElements[i] = runfiles.rlocation(runPathElementPath.toString()); } String runpath = String.join(File.separator, runpathElements); runnerArgs.set(runpathFlag + 1, runpath);