From 898484e1f834c5c7ed7b8740044f2038627647f3 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 24 Jul 2025 11:12:36 -0400 Subject: [PATCH 1/3] Bump dependency versions for `rules_scala` v7.1.0 Bumps most dependency versions (except `rules_python` under `WORKSPACE`) to the latest available before releasing `rules_scala` v7.1.0. Also bumps the `rules_scala` version number in `MODULE.bazel` to `7.1.0`. - Go: 1.24.4 => 1.24.5 - Scalafmt: 3.9.7 => 3.9.8 - `bazel_skylib`: 1.7.1 => 1.8.1 - `gazelle`: 0.43.0 => 0.44.0 - `golang.org/x/tools`: v0.34.0 => v0.35.0 - `org.scala-sbt:util-interface`: 1.11.1 => 1.11.3 - `proto-google-common-protos`: 2.58.0 => 2.59.2 - `rules_cc`: 0.1.1 => 0.1.4 - `rules_go`: 0.55.0 => 0.55.1 - `rules_java`: 8.12.0 => 8.14.0 - `rules_jvm_external`: 6.7 => 6.8 - `rules_python`: 1.4.1 => 1.5.1 (Bzlmod only) Also: - Moves the `http_archive` instantiations of `rules_python` and `rules_shell` from individual `WORKSPACE` files to `//scala:latest_deps.bzl`. Removes `load` statements for `http_archive` throughout all `WORKSPACE` files. - Removes the `--incompatible_autoload_externally` flag from `.bazelrc`. - Fixes `_get_compiler_srcjar` from `//scala/private:macros/scala_repositories.bzl` to return empty `compiler_srcjar_objects` instead of returning a valid object. Caught by `test_compiler_srcjar_error 2.12.11` from `dt_patches/dt_patch_test.sh` when testing under `WORKSPACE`. Added `test_fail_if_compiler_srcjar_object_is_empty` to `test/shell/test_compiler_sources_integrity.sh` to catch the specific problem sooner. --- This is to ensure that we're compatible with the latest dependencies available before releasing a new minor version. I moved the `rules_python` instantiation to `//scala:latest_deps.bzl` because it was such a pain to update everywhere. `latest_deps.bzl` is essentially a development file, or a "use at your own risk" file, and the primary consumers are internal test modules. This will make future `rules_python` updates less noisy. The only `rules_shell` instantiations were in the top level `WORKSPACE` and `test_version/WORKSPACE.template`. I moved `rules_shell` into `latest_deps.bzl` to eliminate these direct instantations as well, and to remove the `http_archive` imports from those files. I'd added `--incompatible_autoload_externally` in #1748 when fixing problems with `WORKSPACE` builds under Bazel 8.2.1. However, it's not really necessary, so I removed it. Updating `rules_python` from 1.4.1 to 1.5.1 produced the following error in Bazel 7.6.1 WORKSPACE builds, even with `--incompatible_autoload_externally=+@rules_python`: ```txt $ bazel build //src/... //test/... WARNING: Couldn't auto load rules or symbols, because no dependency on module/repository 'rules_python' found. This will result in a failure if there's a reference to those rules or symbols. ERROR: test/BUILD:824:10: in py_binary rule //test:py_resource_binary: Traceback (most recent call last): File ".../external/rules_python/python/private/py_binary_rule.bzl", line 24, column 30, in _py_binary_impl return py_executable_impl( File ".../external/rules_python/python/private/py_executable.bzl", line 255, column 35, in py_executable_impl py_executable_base_impl( File ".../external/rules_python/python/private/py_executable.bzl", line 1140, column 46, in py_executable_base_impl exec_result = semantics.create_executable( File ".../external/rules_python/python/private/py_executable.bzl", line 365, column 33, in _create_executable _create_stage1_bootstrap( File ".../external/rules_python/python/private/py_executable.bzl", line 809, column 27, in _create_stage1_bootstrap if runtime and runtime.supports_build_time_venv: Error: 'PyRuntimeInfo' value has no field or method 'supports_build_time_venv' Available attributes: bootstrap_template, coverage_files, coverage_tool, files, interpreter, interpreter_path, python_version, stub_shebang ERROR: test/BUILD:824:10: Analysis of target '//test:py_resource_binary' failed ERROR: Analysis of target '//test:py_resource_binary' failed; build aborted ``` This is due to bazel-contrib/rules_python#2760. In contrast, Bazel 8.3.1 builds work fine, as do Bazel 7.6.1 builds under Bzlmod. Trying `--incompatible_autoload_externally=PyRuntimeInfo` to work around the problem under Bazel 7.6.1 produced: ```txt $ bazel build //src/... //test/... FATAL: bazel crashed due to an internal error. Printing stack trace: java.lang.IllegalStateException: Symbol in 'PyRuntimeInfo' can't be removed, because it's still used by: py_binary, py_test, py_library at com.google.devtools.build.lib.packages.AutoloadSymbols.(AutoloadSymbols.java:192) [...snip...] ``` And with `--incompatible_autoload_externally=@rules_python` produced: ```txt WARNING: Couldn't auto load rules or symbols, because no dependency on module/repository 'rules_python' found. This will result in a failure if there's a reference to those rules or symbols. ERROR: .../external/bazel_tools/tools/python/toolchain.bzl:25:44: name 'PyRuntimeInfo' is not defined ERROR: .../external/bazel_tools/tools/python/toolchain.bzl:33:44: name 'PyRuntimeInfo' is not defined ERROR: .../external/bazel_tools/tools/python/toolchain.bzl:64:26: name 'PyRuntimeInfo' is not defined ERROR: .../external/bazel_tools/tools/python/toolchain.bzl:72:26: name 'PyRuntimeInfo' is not defined WARNING: Target pattern parsing failed. ERROR: Skipping '//test/...': error loading package under directory 'test': error loading package 'test': at .../external/rules_python/python/defs.bzl:21:6: at .../external/rules_python/python/py_runtime_pair.bzl:17:6: compilation of module 'tools/python/toolchain.bzl' failed ERROR: error loading package under directory 'test': error loading package 'test': at .../external/rules_python/python/defs.bzl:21:6: at .../external/rules_python/python/py_runtime_pair.bzl:17:6: compilation of module 'tools/python/toolchain.bzl' failed ``` `tools/python/toolchain.bzl` from Bazel 7.6.1 breaks because it references the builtin `PyRuntimeInfo` instead of `load`ing it from `@rules_python`. Bazel 8 replaces that file's entire implementation with a function that `fail`s with a deprecation error and doesn't use `PyRuntimeInfo`: - https://github.com/bazelbuild/bazel/blob/7.6.1/tools/python/toolchain.bzl - https://github.com/bazelbuild/bazel/blob/8.0.0/tools/python/toolchain.bzl Using `+@rules_python` or `+PyRuntimeInfo` produced the original error. Nothing I could do could avoid using the builtin `PyRuntimeInfo` under Bazel 7.6.1. Since it's only a development dependency for `WORKSPACE` builds, I decided to keep `rules_python` at 1.4.1 in `latest_deps.bzl` for now. I've filed bazel-contrib/rules_python#3119 to get it on the record. --- .bazelrc | 2 +- .scalafmt.conf | 2 +- MODULE.bazel | 18 ++++---- WORKSPACE | 22 ++-------- deps/latest/MODULE.bazel | 6 +-- dt_patches/test_dt_patches/WORKSPACE | 9 ---- .../test_dt_patches_user_srcjar/WORKSPACE | 9 ---- examples/crossbuild/WORKSPACE | 9 ---- examples/overridden_artifacts/WORKSPACE | 9 ---- examples/scala3/WORKSPACE | 9 ---- examples/semanticdb/WORKSPACE | 9 ---- .../multi_frameworks_toolchain/WORKSPACE | 9 ---- .../testing/scalatest_repositories/WORKSPACE | 9 ---- .../specs2_junit_repositories/WORKSPACE | 9 ---- examples/twitter_scrooge/WORKSPACE | 20 --------- scala/latest_deps.bzl | 34 +++++++++++--- scala/private/macros/scala_repositories.bzl | 2 +- scripts/create_repository.py | 8 ++-- test/compiler_sources_integrity/MODULE.bazel | 5 +++ test/compiler_sources_integrity/WORKSPACE | 1 + test/scalafmt/.scalafmt.conf | 2 +- test/shell/test_compiler_sources_integrity.sh | 15 +++++++ test_cross_build/WORKSPACE | 9 ---- test_cross_build/scalafmt/.scalafmt2.conf | 2 +- test_cross_build/scalafmt/.scalafmt3.conf | 2 +- test_version/WORKSPACE.template | 16 ------- third_party/repositories/scala_2_11.bzl | 4 +- third_party/repositories/scala_2_12.bzl | 40 ++++++++--------- third_party/repositories/scala_2_13.bzl | 40 ++++++++--------- third_party/repositories/scala_3_1.bzl | 44 +++++++++---------- third_party/repositories/scala_3_2.bzl | 44 +++++++++---------- third_party/repositories/scala_3_3.bzl | 44 +++++++++---------- third_party/repositories/scala_3_4.bzl | 44 +++++++++---------- third_party/repositories/scala_3_5.bzl | 44 +++++++++---------- third_party/repositories/scala_3_6.bzl | 44 +++++++++---------- third_party/repositories/scala_3_7.bzl | 44 +++++++++---------- .../test/example_external_workspace/WORKSPACE | 9 ---- third_party/test/proto/WORKSPACE | 9 ---- 38 files changed, 270 insertions(+), 387 deletions(-) diff --git a/.bazelrc b/.bazelrc index 755ddc225..76ad56834 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,5 +1,5 @@ # Remove once Bazel 8 becomes the minimum supported version. -common --noenable_workspace --incompatible_use_plus_in_repo_names --incompatible_autoload_externally= +common --noenable_workspace --incompatible_use_plus_in_repo_names # Uncomment to run tests under `WORKSPACE`. Remove once Bazel 9 becomes the # minimum supported version. diff --git a/.scalafmt.conf b/.scalafmt.conf index 0bb2820ce..defe941e0 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.7" +version = "3.9.8" runner.dialect = scala213 align.openParenCallSite = false align.openParenDefnSite = false diff --git a/MODULE.bazel b/MODULE.bazel index c32f597f1..0b0744ba0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ module( name = "rules_scala", - version = "7.0.0", + version = "7.1.0", bazel_compatibility = [">=7.1.0"], compatibility_level = 7, ) @@ -30,7 +30,7 @@ SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS bazel_dep(name = "bazel_skylib", version = "1.6.0") single_version_override( module_name = "bazel_skylib", - version = "1.7.1", + version = "1.8.1", ) bazel_dep(name = "platforms", version = "0.0.9") @@ -42,7 +42,7 @@ single_version_override( bazel_dep(name = "rules_java", version = "7.6.0") single_version_override( module_name = "rules_java", - version = "8.12.0", + version = "8.14.0", ) bazel_dep(name = "rules_proto", version = "6.0.0") @@ -254,18 +254,18 @@ bazel_dep( ) bazel_dep( name = "rules_go", - version = "0.55.0", + version = "0.55.1", dev_dependency = True, repo_name = "io_bazel_rules_go", # for com_github_bazelbuild_buildtools ) -bazel_dep(name = "gazelle", version = "0.43.0", dev_dependency = True) +bazel_dep(name = "gazelle", version = "0.44.0", dev_dependency = True) go_sdk = use_extension( "@io_bazel_rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True, ) -go_sdk.download(version = "1.24.4") +go_sdk.download(version = "1.24.5") go_deps = use_extension( "@gazelle//:extensions.bzl", @@ -287,8 +287,8 @@ go_deps = use_extension( # curl https://sum.golang.org/lookup/golang.org/x/tools@v0.34.0 go_deps.module( path = "golang.org/x/tools", - sum = "h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=", - version = "v0.34.0", + sum = "h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=", + version = "v0.35.0", ) go_deps.module( path = "github.com/golang/protobuf", @@ -301,5 +301,5 @@ use_repo( "org_golang_x_tools", ) -bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True) +bazel_dep(name = "rules_python", version = "1.5.1", dev_dependency = True) bazel_dep(name = "rules_shell", version = "0.5.0", dev_dependency = True) diff --git a/WORKSPACE b/WORKSPACE index ea6abe0cb..c92caa48c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -31,13 +31,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() @@ -112,10 +105,10 @@ local_repository( http_archive( name = "io_bazel_rules_go", - sha256 = "c6cf9da6668ac84c470c43cbfccb8fdc844ead2b5a8b918e2816d44f2986f644", + sha256 = "9d72f7b8904128afb98d46bbef82ad7223ec9ff3718d419afb355fddd9f9484a", urls = [ - "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip", - "https://github.com/bazel-contrib/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip", + "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.55.1/rules_go-v0.55.0.zip", + "https://github.com/bazel-contrib/rules_go/releases/download/v0.55.1/rules_go-v0.55.1.zip", ], ) @@ -127,7 +120,7 @@ load( go_rules_dependencies() -go_register_toolchains(version = "1.24.4") +go_register_toolchains(version = "1.24.5") http_archive( name = "bazelci_rules", @@ -149,13 +142,6 @@ dev_deps_repositories() register_toolchains("//test/toolchains:java21_toolchain_definition") -http_archive( - name = "rules_shell", - sha256 = "b15cc2e698a3c553d773ff4af35eb4b3ce2983c319163707dddd9e70faaa062d", - strip_prefix = "rules_shell-0.5.0", - url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.5.0/rules_shell-v0.5.0.tar.gz", -) - load( "@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", diff --git a/deps/latest/MODULE.bazel b/deps/latest/MODULE.bazel index b7fa0a663..04b5f0ec2 100644 --- a/deps/latest/MODULE.bazel +++ b/deps/latest/MODULE.bazel @@ -6,13 +6,13 @@ module( bazel_compatibility = [">=7.1.0"], ) -bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "protobuf", version = "31.1") -bazel_dep(name = "rules_java", version = "8.12.0") +bazel_dep(name = "rules_java", version = "8.14.0") bazel_dep(name = "rules_proto", version = "7.1.0") # https://github.com/bazelbuild/bazel/pull/25681 removed # `bazel_tools/tools/cpp/osx_cc_wrapper.sh.tpl` in the `last_green` Bazel as of # 2025-04-08. At least `test_cross_build` breaks without this. -bazel_dep(name = "rules_cc", version = "0.1.1") +bazel_dep(name = "rules_cc", version = "0.1.4") diff --git a/dt_patches/test_dt_patches/WORKSPACE b/dt_patches/test_dt_patches/WORKSPACE index a9ad474c5..f82af7e74 100644 --- a/dt_patches/test_dt_patches/WORKSPACE +++ b/dt_patches/test_dt_patches/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "test_dt_patches") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 2b942685e..ac5873ae2 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "test_dt_patches") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index b171efeac..bb49b1bf9 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "cross_build") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/overridden_artifacts/WORKSPACE b/examples/overridden_artifacts/WORKSPACE index 2641b3324..5eeca23f8 100644 --- a/examples/overridden_artifacts/WORKSPACE +++ b/examples/overridden_artifacts/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "overridden_artifacts") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index a5bdade74..f8ee204ea 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "specs2_junit_repositories") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 421abdc05..ac7ef16e5 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "specs2_junit_repositories") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/testing/multi_frameworks_toolchain/WORKSPACE b/examples/testing/multi_frameworks_toolchain/WORKSPACE index bf234ce9f..bb84fedeb 100644 --- a/examples/testing/multi_frameworks_toolchain/WORKSPACE +++ b/examples/testing/multi_frameworks_toolchain/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "multi_frameworks_toolchain") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/testing/scalatest_repositories/WORKSPACE b/examples/testing/scalatest_repositories/WORKSPACE index 03ad6bdac..1337684f0 100644 --- a/examples/testing/scalatest_repositories/WORKSPACE +++ b/examples/testing/scalatest_repositories/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "scalatest_repositories") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/testing/specs2_junit_repositories/WORKSPACE b/examples/testing/specs2_junit_repositories/WORKSPACE index 127736d45..3baf8d5e6 100644 --- a/examples/testing/specs2_junit_repositories/WORKSPACE +++ b/examples/testing/specs2_junit_repositories/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "specs2_junit_repositories") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/examples/twitter_scrooge/WORKSPACE b/examples/twitter_scrooge/WORKSPACE index 2faebd6b1..3fbcbd5e1 100644 --- a/examples/twitter_scrooge/WORKSPACE +++ b/examples/twitter_scrooge/WORKSPACE @@ -1,8 +1,6 @@ # Test configuration for test/shell/test_twitter_scrooge_toolchains.sh. workspace(name = "twitter_scrooge_toolchains") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../..", @@ -30,13 +28,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() @@ -65,17 +56,6 @@ load("@rules_scala//protoc:toolchains.bzl", "scala_protoc_toolchains") scala_protoc_toolchains(name = "rules_scala_protoc_toolchains") -RULES_JVM_EXTERNAL_TAG = "6.7" - -RULES_JVM_EXTERNAL_SHA = "a1e351607f04fed296ba33c4977d3fe2a615ed50df7896676b67aac993c53c18" - -http_archive( - name = "rules_jvm_external", - sha256 = RULES_JVM_EXTERNAL_SHA, - strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, - url = "https://github.com/bazel-contrib/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG), -) - load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") rules_jvm_external_deps() diff --git a/scala/latest_deps.bzl b/scala/latest_deps.bzl index ab8bb5518..f8cdcbc31 100644 --- a/scala/latest_deps.bzl +++ b/scala/latest_deps.bzl @@ -8,10 +8,10 @@ def rules_scala_dependencies(): maybe( http_archive, name = "bazel_skylib", - sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", ], ) @@ -29,9 +29,9 @@ def rules_scala_dependencies(): http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/8.12.0/rules_java-8.12.0.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/8.14.0/rules_java-8.14.0.tar.gz", ], - sha256 = "1558508fc6c348d7f99477bd21681e5746936f15f0436b5f4233e30832a590f9", + sha256 = "bbe7d94360cc9ed4607ec5fd94995fd1ec41e84257020b6f09e64055281ecb12", ) maybe( @@ -55,9 +55,9 @@ def rules_scala_dependencies(): # Resolves the following error when building under `WORKSPACE` with Bazel 8.2.1, # `protobuf` v31.1, and `rules_java` 8.12.0: # https://github.com/protocolbuffers/protobuf/pull/19129#issuecomment-2968934424 - rules_jvm_external_tag = "6.7" + rules_jvm_external_tag = "6.8" rules_jvm_external_sha = ( - "a1e351607f04fed296ba33c4977d3fe2a615ed50df7896676b67aac993c53c18" + "704a0197e4e966f96993260418f2542568198490456c21814f647ae7091f56f2" ) maybe( http_archive, @@ -69,3 +69,23 @@ def rules_scala_dependencies(): rules_jvm_external_tag, ), ) + + # Can't upgrade for now because https://github.com/bazel-contrib/rules_python/pull/2760 + # broke Bazel 7 WORKSPACE builds. It's really only a dev dep anyway. + # If it's fixed per https://github.com/bazel-contrib/rules_python/issues/3119, + # then we can upgrade. + maybe( + http_archive, + name = "rules_python", + sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", + strip_prefix = "rules_python-1.4.1", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", + ) + + maybe( + http_archive, + name = "rules_shell", + sha256 = "b15cc2e698a3c553d773ff4af35eb4b3ce2983c319163707dddd9e70faaa062d", + strip_prefix = "rules_shell-0.5.0", + url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.5.0/rules_shell-v0.5.0.tar.gz", + ) diff --git a/scala/private/macros/scala_repositories.bzl b/scala/private/macros/scala_repositories.bzl index 9f31a145b..7dc21c754 100644 --- a/scala/private/macros/scala_repositories.bzl +++ b/scala/private/macros/scala_repositories.bzl @@ -58,7 +58,7 @@ compiler_sources_repo = repository_rule( ) def _get_compiler_srcjar(scala_version, scala_compiler_srcjar): - if scala_compiler_srcjar: + if scala_compiler_srcjar != None: return scala_compiler_srcjar compiler_srcjar = COMPILER_SOURCES.get(scala_version, None) diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 0b98b54b9..a4bf0760a 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -28,16 +28,16 @@ ] PARSER_COMBINATORS_VERSION = '1.1.2' SBT_COMPILER_INTERFACE_VERSION = '1.10.8' -SBT_UTIL_INTERFACE_VERSION = '1.11.1' +SBT_UTIL_INTERFACE_VERSION = '1.11.3' SCALATEST_VERSION = "3.2.19" -SCALAFMT_VERSION = "3.9.7" +SCALAFMT_VERSION = "3.9.8" KIND_PROJECTOR_VERSION = "0.13.3" PROTOBUF_JAVA_VERSION = "4.31.1" JLINE_VERSION = '3.30.4' SCALAPB_VERSION = '1.0.0-alpha.1' PROTOC_BRIDGE_VERSION = '0.9.9' GRPC_VERSION = '1.73.0' -GRPC_COMMON_PROTOS_VERSION = '2.58.0' +PROTO_GOOGLE_COMMON_PROTOS_VERSION = '2.59.2' GRPC_LIBS = ['netty', 'protobuf', 'stub'] GUAVA_VERSION = '33.4.8-jre' @@ -107,7 +107,7 @@ def select_root_artifacts(scala_version, scala_major, is_scala_3) -> List[str]: root_artifacts = [ 'com.google.api.grpc:proto-google-common-protos:' + - GRPC_COMMON_PROTOS_VERSION, + PROTO_GOOGLE_COMMON_PROTOS_VERSION, f'com.google.guava:guava:{GUAVA_VERSION}', f'com.google.protobuf:protobuf-java:{PROTOBUF_JAVA_VERSION}', f'com.thesamet.scalapb:compilerplugin_{scalapb_major}:' + diff --git a/test/compiler_sources_integrity/MODULE.bazel b/test/compiler_sources_integrity/MODULE.bazel index c0ba183e2..6ec092d6a 100644 --- a/test/compiler_sources_integrity/MODULE.bazel +++ b/test/compiler_sources_integrity/MODULE.bazel @@ -39,6 +39,11 @@ scala_deps.compiler_srcjar( ), version = "3.1.999", ) + +# Used for test_fail_if_compiler_srcjar_object_is_empty. +scala_deps.compiler_srcjar( + version = "3.1.1000", +) use_repo( scala_deps, "scala_compiler_sources", diff --git a/test/compiler_sources_integrity/WORKSPACE b/test/compiler_sources_integrity/WORKSPACE index f942f7a49..c009ee82d 100644 --- a/test/compiler_sources_integrity/WORKSPACE +++ b/test/compiler_sources_integrity/WORKSPACE @@ -49,6 +49,7 @@ scala_toolchains( "scala3-compiler_3/3.1.3/scala3-compiler_3-3.1.3-sources.jar" ), }, + "3.1.1000": {}, }, # Since we're using a bogus Scala version in the compiler_srcjar. validate_scala_version = False, diff --git a/test/scalafmt/.scalafmt.conf b/test/scalafmt/.scalafmt.conf index dded57278..04c07e3da 100644 --- a/test/scalafmt/.scalafmt.conf +++ b/test/scalafmt/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.7" +version = "3.9.8" runner.dialect = scala213 maxColumn = 40 lineEndings = preserve diff --git a/test/shell/test_compiler_sources_integrity.sh b/test/shell/test_compiler_sources_integrity.sh index 7c264d3e3..753102cb7 100755 --- a/test/shell/test_compiler_sources_integrity.sh +++ b/test/shell/test_compiler_sources_integrity.sh @@ -188,6 +188,21 @@ test_fail_with_scala3_compiler_source_link_for_unknown_major_version() { _expect_failure_with_guessed_url "$scala_version" "$guessed_url" } +test_fail_if_compiler_srcjar_object_is_empty() { + # This case is covered more in depth in dt_patches/dt_patch_test.sh via its + # test_compiler_srcjar_error helper function. However, we did have a bug + # whereby _get_compiler_srcjar incorrectly returned a valid value when its + # scala_compiler_srcjar argument was empty. Therefore it's worth testing here. + local expected_msg=( + "scala_compiler_srcjar invalid, must be a dict with exactly one of" + '"label", "url" or "urls" keys, got: {' + ) + + action_should_fail_with_message \ + "${expected_msg[*]}" \ + build --repo_env=SCALA_VERSION=3.1.1000 //... +} + # main() setup_suite diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index ab87c8dd4..3337aa343 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -1,7 +1,5 @@ # WORKSPACE -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/test_cross_build/scalafmt/.scalafmt2.conf b/test_cross_build/scalafmt/.scalafmt2.conf index dded57278..04c07e3da 100644 --- a/test_cross_build/scalafmt/.scalafmt2.conf +++ b/test_cross_build/scalafmt/.scalafmt2.conf @@ -1,4 +1,4 @@ -version = "3.9.7" +version = "3.9.8" runner.dialect = scala213 maxColumn = 40 lineEndings = preserve diff --git a/test_cross_build/scalafmt/.scalafmt3.conf b/test_cross_build/scalafmt/.scalafmt3.conf index b50901939..76d01713e 100644 --- a/test_cross_build/scalafmt/.scalafmt3.conf +++ b/test_cross_build/scalafmt/.scalafmt3.conf @@ -1,4 +1,4 @@ -version = "3.9.7" +version = "3.9.8" runner.dialect = scala3 maxColumn = 40 lineEndings = preserve diff --git a/test_version/WORKSPACE.template b/test_version/WORKSPACE.template index 6743876f7..ca445d32a 100644 --- a/test_version/WORKSPACE.template +++ b/test_version/WORKSPACE.template @@ -1,7 +1,5 @@ workspace(name = "rules_scala_test") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../" @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_shell", - sha256 = "bc61ef94facc78e20a645726f64756e5e285a045037c7a61f65af2941f4c25e1", - strip_prefix = "rules_shell-0.4.1", - url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz", -) - load( "@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", @@ -46,13 +37,6 @@ rules_shell_dependencies() rules_shell_toolchains() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl index 007f74494..752a31a40 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -782,8 +782,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index f9cb31478..1b346d804 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -425,8 +425,8 @@ artifacts = { ], }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.12:4.13.6", - "sha256": "eb9587a235110d315539084f7b69523245dcc312c711a46db75afab69ca24130", + "artifact": "org.scalameta:common_2.12:4.13.8", + "sha256": "7d26c32e535ebdf378370ed43501a25d3ed7e529a48952b9ea5455918a879e67", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library", @@ -449,8 +449,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.12:4.13.6", - "sha256": "f4280f66d36ff3cde0c0f02df4d9820ddc790e478101c0a0cc4719c671a80e65", + "artifact": "org.scalameta:io_2.12:4.13.8", + "sha256": "6f13dd7bb44db8be8c711dec8e1785a28b6c559d78c6b5a35064ef41138b5042", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -493,16 +493,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.12:4.13.6", - "sha256": "d510f3120f56e73d63dcdb997f2eabdcfd5ffe64b50c6e218ad502ab498f1df5", + "artifact": "org.scalameta:parsers_2.12:4.13.8", + "sha256": "f7acdec7123b096aceae9c4f8a0f964be0303846180c0002be861e47de425b96", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.12:3.9.7", - "sha256": "1d2691705709257a6c9117d3a0f2202c0683f0a923cc5482f8de59480001f6d5", + "artifact": "org.scalameta:scalafmt-config_2.12:3.9.8", + "sha256": "2b872507ce601b06c1cace02d30c5b54723699acb93719513d0992d8d896f77c", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_metaconfig_core", @@ -510,8 +510,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.12:3.9.7", - "sha256": "e54f1ab7c6dc6123ca2badbddf27bdf44623a0d2964ffed28c7c6f3549872f35", + "artifact": "org.scalameta:scalafmt-core_2.12:3.9.8", + "sha256": "e0ab9e856406c7c1845c34e3759614f07d690a46ab056c0a3745b9c6851c4612", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_mdoc_parser", @@ -521,8 +521,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.12:3.9.7", - "sha256": "d856ace4bfe9fb84737304861f2c714096ca9ca257e99db32ae492b756501b82", + "artifact": "org.scalameta:scalafmt-macros_2.12:3.9.8", + "sha256": "d83839f7598027e9960bdf91e2021d1331a2d3b66c7db67eb3652198235d2d46", "deps": [ "@io_bazel_rules_scala_scala_library", "@io_bazel_rules_scala_scala_reflect", @@ -530,16 +530,16 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.12:3.9.7", - "sha256": "3e61f000783432dc9571142b1457a3ef266b4b58a3e982b46d6f8f28bb6060d9", + "artifact": "org.scalameta:scalafmt-sysops_2.12:3.9.8", + "sha256": "95ac178cf456306ff49c2f40e46ab78c9531d8bf736850ea61080199828f268d", "deps": [ "@com_github_bigwheel_util_backports", "@io_bazel_rules_scala_scala_library", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.12:4.13.6", - "sha256": "9bcc55e65085284925640f77d7e42661884812aa495ca6c28645d5e1d784dba1", + "artifact": "org.scalameta:scalameta_2.12:4.13.8", + "sha256": "8a163d47465cc3f3b8ef032c3fe959d51f4704da1d81003d6d4edbd2ac6a0be5", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_parsers", @@ -553,8 +553,8 @@ artifacts = { ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.12:4.13.6", - "sha256": "5a52d7d391c24df5bec09d5f6e72f756097657417fe00ef29783cbc088d05925", + "artifact": "org.scalameta:trees_2.12:4.13.8", + "sha256": "90000b3df2e2940d537af90e7be79f4059d3fafda8c521ef029d215ac2684c8e", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_common", @@ -812,8 +812,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index c97e10ae7..7f3c9dc8f 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -449,8 +449,8 @@ artifacts = { ], }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library", @@ -473,8 +473,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library", ], @@ -517,16 +517,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_metaconfig_core", @@ -534,8 +534,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_mdoc_parser", @@ -545,8 +545,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library", "@io_bazel_rules_scala_scala_reflect", @@ -554,15 +554,15 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_parsers", @@ -576,8 +576,8 @@ artifacts = { ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library", "@org_scalameta_common", @@ -835,8 +835,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index 84f7c6c90..cc7fe024f 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -498,12 +498,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -526,8 +526,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -570,16 +570,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -587,8 +587,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -598,8 +598,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -607,23 +607,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -881,8 +881,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index 4cc34cb7d..e804292ce 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -498,12 +498,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -526,8 +526,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -570,16 +570,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -587,8 +587,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -598,8 +598,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -607,23 +607,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -881,8 +881,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 4e62487bd..c28350b4f 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -514,12 +514,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -542,8 +542,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -586,16 +586,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -603,8 +603,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -614,8 +614,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -623,23 +623,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -897,8 +897,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index 7ca9d0cfe..7228dd239 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -505,12 +505,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -533,8 +533,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -577,16 +577,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -594,8 +594,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -605,8 +605,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -614,23 +614,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -888,8 +888,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index fad9fec8f..f57bac589 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -505,12 +505,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -533,8 +533,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -577,16 +577,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -594,8 +594,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -605,8 +605,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -614,23 +614,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -888,8 +888,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_6.bzl b/third_party/repositories/scala_3_6.bzl index 4b5ef1c38..6548b14ae 100644 --- a/third_party/repositories/scala_3_6.bzl +++ b/third_party/repositories/scala_3_6.bzl @@ -514,12 +514,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -542,8 +542,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -586,16 +586,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -603,8 +603,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -614,8 +614,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -623,23 +623,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -897,8 +897,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/repositories/scala_3_7.bzl b/third_party/repositories/scala_3_7.bzl index 67581b03c..16b9881f9 100644 --- a/third_party/repositories/scala_3_7.bzl +++ b/third_party/repositories/scala_3_7.bzl @@ -514,12 +514,12 @@ artifacts = { ], }, "org_scala_sbt_util_interface": { - "artifact": "org.scala-sbt:util-interface:1.11.1", - "sha256": "33760952e89ea64f289498b13ccbed8547674d0ccb2fffba037eaec43e732296", + "artifact": "org.scala-sbt:util-interface:1.11.3", + "sha256": "54604a816ac92d25542e8e0eeed26a1fee953b04082af1f85fd425b954586a7b", }, "org_scalameta_common": { - "artifact": "org.scalameta:common_2.13:4.13.6", - "sha256": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", + "artifact": "org.scalameta:common_2.13:4.13.8", + "sha256": "44783d7342e7084c5a46f49fd7ea5b6983544e3fab0d43516780302264513588", "deps": [ "@com_lihaoyi_sourcecode", "@io_bazel_rules_scala_scala_library_2", @@ -542,8 +542,8 @@ artifacts = { ], }, "org_scalameta_io": { - "artifact": "org.scalameta:io_2.13:4.13.6", - "sha256": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", + "artifact": "org.scalameta:io_2.13:4.13.8", + "sha256": "c1e696d8a4476bf4bf1a35f0c2cb003ef43ef110d276c2a8f958a55a740ef1c9", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], @@ -586,16 +586,16 @@ artifacts = { ], }, "org_scalameta_parsers": { - "artifact": "org.scalameta:parsers_2.13:4.13.6", - "sha256": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", + "artifact": "org.scalameta:parsers_2.13:4.13.8", + "sha256": "8fd70ce317935b8beb971482d9e3b5fe888472a03c5c9e58472429b33901007b", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_trees", ], }, "org_scalameta_scalafmt_config": { - "artifact": "org.scalameta:scalafmt-config_2.13:3.9.7", - "sha256": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", + "artifact": "org.scalameta:scalafmt-config_2.13:3.9.8", + "sha256": "1ccff8909494a027daa1efe7368f339fed7eef3a09328b7d33ab95ee58bef2af", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_metaconfig_core", @@ -603,8 +603,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_core": { - "artifact": "org.scalameta:scalafmt-core_2.13:3.9.7", - "sha256": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", + "artifact": "org.scalameta:scalafmt-core_2.13:3.9.8", + "sha256": "5b31cbffc2a58099f4c28f95b5abf7f760639123642a7124c91db0aee1065276", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_mdoc_parser", @@ -614,8 +614,8 @@ artifacts = { ], }, "org_scalameta_scalafmt_macros": { - "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.7", - "sha256": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", + "artifact": "org.scalameta:scalafmt-macros_2.13:3.9.8", + "sha256": "b935061968834abc2e9d35f2a5dbb449fac932f5f3c89bf83f59b989ade51e00", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@io_bazel_rules_scala_scala_reflect_2", @@ -623,23 +623,23 @@ artifacts = { ], }, "org_scalameta_scalafmt_sysops": { - "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.7", - "sha256": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", + "artifact": "org.scalameta:scalafmt-sysops_2.13:3.9.8", + "sha256": "bc3f95122f94f12e8e8525755392ab632ea61ca9e1a190ff9881bf21f6733498", "deps": [ "@io_bazel_rules_scala_scala_library_2", ], }, "org_scalameta_scalameta": { - "artifact": "org.scalameta:scalameta_2.13:4.13.6", - "sha256": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", + "artifact": "org.scalameta:scalameta_2.13:4.13.8", + "sha256": "f5853ebeea523dfa7f0bea4a1c41347842de2433e55e5e716ba3a24e74e44e33", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_parsers", ], }, "org_scalameta_trees": { - "artifact": "org.scalameta:trees_2.13:4.13.6", - "sha256": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", + "artifact": "org.scalameta:trees_2.13:4.13.8", + "sha256": "c0f4397a672748be9452fc898a20396ca9b24ed4b36d92ee99db4b9a663072f8", "deps": [ "@io_bazel_rules_scala_scala_library_2", "@org_scalameta_common", @@ -897,8 +897,8 @@ artifacts = { "sha256": "c7b478503ec524e55df19b424d46d27c8a68aeb801664fadd4f069b71f52d0f6", }, "scala_proto_rules_proto_google_common_protos": { - "artifact": "com.google.api.grpc:proto-google-common-protos:2.58.0", - "sha256": "f8640af546c0afe26477fc5e946a7f455a1afebfc73d021b0c8a5034b8e67152", + "artifact": "com.google.api.grpc:proto-google-common-protos:2.59.2", + "sha256": "9407f50aef5d1cb12675c170fa64ee216023eefca49f8f5eac45124f23a6cb29", "deps": [ "@com_google_protobuf_protobuf_java", ], diff --git a/third_party/test/example_external_workspace/WORKSPACE b/third_party/test/example_external_workspace/WORKSPACE index f3471239c..7dcf6acef 100644 --- a/third_party/test/example_external_workspace/WORKSPACE +++ b/third_party/test/example_external_workspace/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "example_external_workspace") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/third_party/test/proto/WORKSPACE b/third_party/test/proto/WORKSPACE index a5a339672..448754a0a 100644 --- a/third_party/test/proto/WORKSPACE +++ b/third_party/test/proto/WORKSPACE @@ -1,7 +1,5 @@ workspace(name = "proto") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - local_repository( name = "rules_scala", path = "../../..", @@ -29,13 +27,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( - name = "rules_python", - sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", - strip_prefix = "rules_python-1.4.1", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz", -) - load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() From 4dff11b935b8ba7e8725c170a507c47e983a62fe Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 24 Jul 2025 18:55:24 -0400 Subject: [PATCH 2/3] Fix test_compiler_sources_integrity.sh on non-Mac The unescaped `{` in the expected failure message caused `test_fail_if_compiler_srcjar_object_is_empty` to fail on Linux and Windows. Rather than escape it, it works just as well to remove it entirely. See also the "Escape '{', '}' in `test/shell/test_bzlmod_macros`" message from #1722 and commit 3f37e26c1a8fa8c610066887bbab44f94d0ff4f3. --- test/shell/test_compiler_sources_integrity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/shell/test_compiler_sources_integrity.sh b/test/shell/test_compiler_sources_integrity.sh index 753102cb7..4623143e3 100755 --- a/test/shell/test_compiler_sources_integrity.sh +++ b/test/shell/test_compiler_sources_integrity.sh @@ -195,7 +195,7 @@ test_fail_if_compiler_srcjar_object_is_empty() { # scala_compiler_srcjar argument was empty. Therefore it's worth testing here. local expected_msg=( "scala_compiler_srcjar invalid, must be a dict with exactly one of" - '"label", "url" or "urls" keys, got: {' + '"label", "url" or "urls" keys, got: ' ) action_should_fail_with_message \ From b11730c82e4d15aca508690d627115f7b8389d6e Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Thu, 24 Jul 2025 19:27:36 -0400 Subject: [PATCH 3/3] Add job to test with Bazel 9.0.0-pre.20250710.1 This is temporary until a fix lands for bazelbuild/bazel#26579, but will ensure that new changes get some degree of prerelease testing. --- .bazelci/presubmit.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 9e27b5108..82d7845a2 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -37,6 +37,16 @@ tasks: # Install xmllint - sudo apt update && sudo apt install --reinstall libxml2-utils -y - "./test_rules_scala.sh || buildkite-agent annotate --style 'warning' \"Optional build with last_green Bazel version failed, [see here](${BUILDKITE_BUILD_URL}#${BUILDKITE_JOB_ID}) (It is not mandatory but worth checking)\"" + # Remove this job once the last_green job passes after a fix lands for + # bazelbuild/bazel#26579. + test_rules_scala_linux_9_prerelease: + name: "./test_rules_scala (Bazel 9 rolling prerelease)" + platform: ubuntu2004 + bazel: 9.0.0-pre.20250710.1 + shell_commands: + # Install xmllint + - sudo apt update && sudo apt install --reinstall libxml2-utils -y + - "./test_rules_scala.sh" test_rules_scala_macos: name: "./test_rules_scala" platform: macos