diff --git a/MODULE.bazel b/MODULE.bazel index 910386d4d..e1043fb43 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ module( name = "rules_scala", - version = "7.1.0", + version = "7.1.1", bazel_compatibility = [">=7.1.0"], compatibility_level = 7, ) @@ -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.15.0", + version = "8.15.1", ) bazel_dep(name = "rules_proto", version = "6.0.0") @@ -63,7 +63,7 @@ single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//protoc:0001-protobuf-19679-rm-protoc-dep.patch"], - version = "31.1", + version = "32.0", ) bazel_dep(name = "bazel_worker_java", version = "0.0.6") @@ -267,7 +267,7 @@ go_sdk = use_extension( "go_sdk", dev_dependency = True, ) -go_sdk.download(version = "1.24.5") +go_sdk.download(version = "1.25.0") go_deps = use_extension( "@gazelle//:extensions.bzl", @@ -289,8 +289,8 @@ go_deps = use_extension( # curl https://sum.golang.org/lookup/golang.org/x/tools@v0.35.0 go_deps.module( path = "golang.org/x/tools", - sum = "h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=", - version = "v0.35.0", + sum = "h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=", + version = "v0.36.0", ) go_deps.module( path = "github.com/golang/protobuf", @@ -303,5 +303,5 @@ use_repo( "org_golang_x_tools", ) -bazel_dep(name = "rules_python", version = "1.5.2", dev_dependency = True) +bazel_dep(name = "rules_python", version = "1.5.3", dev_dependency = True) bazel_dep(name = "rules_shell", version = "0.5.1", dev_dependency = True) diff --git a/WORKSPACE b/WORKSPACE index 2f4088f22..22c0cead1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -120,7 +120,7 @@ load( go_rules_dependencies() -go_register_toolchains(version = "1.24.5") +go_register_toolchains(version = "1.25.0") http_archive( name = "bazelci_rules", diff --git a/deps/latest/MODULE.bazel b/deps/latest/MODULE.bazel index 0352ad191..1f881a262 100644 --- a/deps/latest/MODULE.bazel +++ b/deps/latest/MODULE.bazel @@ -8,8 +8,8 @@ module( 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.15.0") +bazel_dep(name = "protobuf", version = "32.0") +bazel_dep(name = "rules_java", version = "8.15.1") bazel_dep(name = "rules_proto", version = "7.1.0") # https://github.com/bazelbuild/bazel/pull/25681 removed diff --git a/dt_patches/test_dt_patches/MODULE.bazel b/dt_patches/test_dt_patches/MODULE.bazel index 65688d179..d12b653a9 100644 --- a/dt_patches/test_dt_patches/MODULE.bazel +++ b/dt_patches/test_dt_patches/MODULE.bazel @@ -75,12 +75,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel index 3b3b3aeb1..94a8f4eea 100644 --- a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel +++ b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel @@ -191,12 +191,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/crossbuild/MODULE.bazel b/examples/crossbuild/MODULE.bazel index 832505b03..cedb07310 100644 --- a/examples/crossbuild/MODULE.bazel +++ b/examples/crossbuild/MODULE.bazel @@ -55,12 +55,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/crossbuild/protobuf.patch b/examples/crossbuild/protobuf.patch deleted file mode 100644 index 86d7d1b82..000000000 --- a/examples/crossbuild/protobuf.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/protobuf.bzl b/protobuf.bzl -index 283c85850..ad91faba6 100644 ---- a/protobuf.bzl -+++ b/protobuf.bzl -@@ -1,7 +1,9 @@ - load("@bazel_skylib//lib:versions.bzl", "versions") - load("@rules_cc//cc:defs.bzl", "objc_library") - load("@rules_python//python:defs.bzl", "py_library") -+load("//bazel/common:proto_common.bzl", "proto_common") - load("//bazel/common:proto_info.bzl", "ProtoInfo") -+load("//bazel/private:toolchain_helpers.bzl", "toolchains") - - def _GetPath(ctx, path): - if ctx.label.workspace_root: -@@ -71,6 +73,26 @@ def _CsharpOuts(srcs): - for src in srcs - ] - -+_PROTOC_ATTRS = toolchains.if_legacy_toolchain({ -+ "_proto_compiler": attr.label( -+ cfg = "exec", -+ executable = True, -+ allow_files = True, -+ default = configuration_field("proto", "proto_compiler"), -+ ), -+}) -+_PROTOC_FRAGMENTS = ["proto"] -+_PROTOC_TOOLCHAINS = toolchains.use_toolchain(toolchains.PROTO_TOOLCHAIN) -+ -+def _protoc_files_to_run(ctx): -+ if proto_common.INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION: -+ toolchain = ctx.toolchains[toolchains.PROTO_TOOLCHAIN] -+ if not toolchain: -+ fail("Protocol compiler toolchain could not be resolved.") -+ return toolchain.proto.proto_compiler -+ else: -+ return ctx.attr._proto_compiler[DefaultInfo].files_to_run -+ - ProtoGenInfo = provider( - fields = ["srcs", "import_flags", "deps"], - ) -@@ -310,7 +332,7 @@ def _internal_gen_well_known_protos_java_impl(ctx): - args.add_all([src.path[offset:] for src in dep.direct_sources]) - - ctx.actions.run( -- executable = ctx.executable._protoc, -+ executable = _protoc_files_to_run(ctx), - inputs = descriptors, - outputs = [srcjar], - arguments = [args], -@@ -334,12 +356,9 @@ internal_gen_well_known_protos_java = rule( - "javalite": attr.bool( - default = False, - ), -- "_protoc": attr.label( -- executable = True, -- cfg = "exec", -- default = "//:protoc", -- ), -- }, -+ } | _PROTOC_ATTRS, -+ fragments = _PROTOC_FRAGMENTS, -+ toolchains = _PROTOC_TOOLCHAINS, - ) - - def _internal_gen_kt_protos(ctx): -@@ -373,7 +392,7 @@ def _internal_gen_kt_protos(ctx): - args.add_all([src.path[offset:] for src in dep.direct_sources]) - - ctx.actions.run( -- executable = ctx.executable._protoc, -+ executable = _protoc_files_to_run(ctx), - inputs = descriptors, - outputs = [srcjar], - arguments = [args], -@@ -397,12 +416,9 @@ internal_gen_kt_protos = rule( - "lite": attr.bool( - default = False, - ), -- "_protoc": attr.label( -- executable = True, -- cfg = "exec", -- default = "//:protoc", -- ), -- }, -+ } | _PROTOC_ATTRS, -+ fragments = _PROTOC_FRAGMENTS, -+ toolchains = _PROTOC_TOOLCHAINS, - ) - - def internal_objc_proto_library( diff --git a/examples/crossbuild/protobuf.patch b/examples/crossbuild/protobuf.patch new file mode 120000 index 000000000..c8f00be6e --- /dev/null +++ b/examples/crossbuild/protobuf.patch @@ -0,0 +1 @@ +../../protoc/0001-protobuf-19679-rm-protoc-dep.patch \ No newline at end of file diff --git a/examples/overridden_artifacts/MODULE.bazel b/examples/overridden_artifacts/MODULE.bazel index b0c471633..575c1ef03 100644 --- a/examples/overridden_artifacts/MODULE.bazel +++ b/examples/overridden_artifacts/MODULE.bazel @@ -80,12 +80,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/scala3/MODULE.bazel b/examples/scala3/MODULE.bazel index fd11c30fc..50239836b 100644 --- a/examples/scala3/MODULE.bazel +++ b/examples/scala3/MODULE.bazel @@ -39,12 +39,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/semanticdb/MODULE.bazel b/examples/semanticdb/MODULE.bazel index 2327bd811..f7794701d 100644 --- a/examples/semanticdb/MODULE.bazel +++ b/examples/semanticdb/MODULE.bazel @@ -49,12 +49,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/testing/multi_frameworks_toolchain/MODULE.bazel b/examples/testing/multi_frameworks_toolchain/MODULE.bazel index 3a02671c6..b94934b18 100644 --- a/examples/testing/multi_frameworks_toolchain/MODULE.bazel +++ b/examples/testing/multi_frameworks_toolchain/MODULE.bazel @@ -89,12 +89,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/testing/scalatest_repositories/MODULE.bazel b/examples/testing/scalatest_repositories/MODULE.bazel index 0cc31b5af..0dd386e90 100644 --- a/examples/testing/scalatest_repositories/MODULE.bazel +++ b/examples/testing/scalatest_repositories/MODULE.bazel @@ -41,12 +41,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/testing/specs2_junit_repositories/MODULE.bazel b/examples/testing/specs2_junit_repositories/MODULE.bazel index 6657ca2b4..b1ca9a560 100644 --- a/examples/testing/specs2_junit_repositories/MODULE.bazel +++ b/examples/testing/specs2_junit_repositories/MODULE.bazel @@ -41,12 +41,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/examples/twitter_scrooge/MODULE.bazel b/examples/twitter_scrooge/MODULE.bazel index 5dc0d9af7..7d9210392 100644 --- a/examples/twitter_scrooge/MODULE.bazel +++ b/examples/twitter_scrooge/MODULE.bazel @@ -15,7 +15,7 @@ local_path_override( bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) @@ -25,7 +25,7 @@ single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) bazel_dep(name = "rules_jvm_external", version = "6.7") diff --git a/protoc/private/protoc_integrity.bzl b/protoc/private/protoc_integrity.bzl index 512609ed9..208300545 100644 --- a/protoc/private/protoc_integrity.bzl +++ b/protoc/private/protoc_integrity.bzl @@ -10,6 +10,7 @@ PROTOC_DOWNLOAD_URL = ( ) PROTOC_VERSIONS = [ + "32.0", "31.1", "31.0", "30.2", @@ -27,6 +28,7 @@ PROTOC_BUILDS = { "@platforms//cpu:aarch64", ], "integrity": { + "32.0": "sha256-Vq8/wuQ6AjCALm+ttiHYkLpQbFwXoa4QcPaF/nm6EtA=", "31.1": "sha256-bFVN4RzqBMVuv45FtUQ0AZsc2FIj1LvSXCgkJeMG7MI=", "31.0": "sha256-mZ9MAjNmsLaMXGUnLq14d+R6JnAkWnmQS4NFBXXafhk=", "30.2": "sha256-oxc+ozjvkbFgW4jE+BINbIzPNvdE2QgZkdWV0NQ1KZY=", @@ -44,6 +46,7 @@ PROTOC_BUILDS = { "@platforms//cpu:ppc64le", ], "integrity": { + "32.0": "sha256-mGY+JqrteUvC4jM5/WOzs5MdNIlhhStvWk7b3K+jWwU=", "31.1": "sha256-id8WOfnDTTD1WoWt1ID2vWB1phundapoaOdXXRg5gWQ=", "31.0": "sha256-jrbKYaWRhND12vHIfUnemdW5PudWxxIbxRS/NbRxSgg=", "30.2": "sha256-6eTFvQF5CNxmeBg1egQkceyYVVkTBDWA0kBmFnjdhLM=", @@ -61,6 +64,7 @@ PROTOC_BUILDS = { "@platforms//cpu:s390x", ], "integrity": { + "32.0": "sha256-wbcKOUex34jBRbiu+Kz4aM3tGzuBMSUiHwv7YQ/xO7c=", "31.1": "sha256-ea6BxzYpO0qNV7FQm1aK7Oqdf5fRou1ZnL+iuIfMhRE=", "31.0": "sha256-omxFoigT+yWCAywXzCe7xCp0JQZuoeigE0zvDJekc7g=", "30.2": "sha256-1ZBHfuHW4rgQhWt3InNC+yw5GTF4bIXtEqPMdB1Zl08=", @@ -78,6 +82,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_32", ], "integrity": { + "32.0": "sha256-RZLLavNKA9kXH7/BOnmLtTASfZnm1bG8lfK3oJyc1Ms=", "31.1": "sha256-FDDjh3+YrIx2V8HMSeZtXy/xr7Ur/wsAIM4tKBLsgzQ=", "31.0": "sha256-rF81VWpm2MvczQNlgnXnII8jTiP6RSLcXjD8iKXWMe0=", "30.2": "sha256-wnMIeW55RbNqcd3rvR5R8lP2MjVdgwkTQktUwDx3MsY=", @@ -95,6 +100,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "32.0": "sha256-fKA3v+Xlyr1CVczSHdJl9564LTwBAReZT13IHSFA7og=", "31.1": "sha256-llUwQfGpHqDv7pY8sW9GL1mFtNZTZfOQdBTDYARNgGU=", "31.0": "sha256-JOLtMgYLfJkNXrANZC/eBIadf3fG1EP2CTU/CXeZ3UI=", "30.2": "sha256-Mn6Tl8b7PqKlQlE6MiEzTG9296pSSn0lYRQrZ7MSoB8=", @@ -112,6 +118,7 @@ PROTOC_BUILDS = { "@platforms//cpu:aarch64", ], "integrity": { + "32.0": "sha256-CaLHKcyCEhXMDUxWS3YXYJYf4zjFLySzAv1+GOe2ddE=", "31.1": "sha256-Su6go0sJkoR7A6hImo2+3zdG3gEQm3TMLOm2iIqQHtk=", "31.0": "sha256-H75wqNZGh1+Rtv1XKU92MUUpKyyeE3SrCdbiEkr92VA=", "30.2": "sha256-knKMZQ9s8rbDeJGuBO9bwtS18yxfu9EB7aYj+Qu5X2M=", @@ -129,6 +136,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "32.0": "sha256-Y+66Fd3BKrEbCovOgfstRsxpAiw+atIf7N6Q1SE5v/Y=", "31.1": "sha256-SF6HCIsYYUwlqZscBieRiz/1uf3lSSL7HJIBWfq3uik=", "31.0": "sha256-A2DZttnj1mlYz2J02FFNpJ521HX9DXEhgdzH6eBW8sg=", "30.2": "sha256-ZWdcO7h0otXwyUHmG85hdQkL4l/kZvDsLUpvWXgzNiQ=", @@ -146,6 +154,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_32", ], "integrity": { + "32.0": "sha256-EbbTZisXnid9ivNKh3ANxOyytWlRaKxlImeYonmK/Ug=", "31.1": "sha256-dMTjSkHGVJNKH0x9Xj+DGnshbYZ3F833MPguHhDB0OI=", "31.0": "sha256-7EmuJNtNqpTEDlr8wEfTCaYe4V+VRRrY5cehP9P9ubc=", "30.2": "sha256-XK6VrN8WkMCiTxh9uny6JdjuYAhcyVGn2SdM/gdx2RY=", @@ -163,6 +172,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "32.0": "sha256-icF46fh4y23VYfZ3aI4esudXy5rISuMLZENrrBlkaZY=", "31.1": "sha256-cDgbEWqw1xy2pRd9mxfHwTQVhmYDoP1A1RPa/jLVbDU=", "31.0": "sha256-1+3uXQ1dZ4bJLnek9RHkaYpaqSLGOQttCMOnmTWmUbA=", "30.2": "sha256-EPNd93Iqad3o7pK0oWpOHMkc/Ogvu0o3G9BG3hOapKk=", diff --git a/protoc/private/protoc_toolchains.bzl b/protoc/private/protoc_toolchains.bzl index 92bfc2fc6..310986f45 100644 --- a/protoc/private/protoc_toolchains.bzl +++ b/protoc/private/protoc_toolchains.bzl @@ -12,38 +12,53 @@ load( "PROTOC_TOOLCHAIN_TYPE", ) +# Temporary measure until native Windows ARM64 builds exist. +_WIN_AARCH_64_PLATFORM = "win-aarch_64" + def _default_platform(): host_platform = sorted(HOST_CONSTRAINTS) for platform, info in PROTOC_BUILDS.items(): if sorted(info["exec_compat"]) == host_platform: return platform - # Temporary measure until native Windows ARM64 builds exist. if host_platform == ["@platforms//cpu:aarch64", "@platforms//os:windows"]: - return "win64" + return _WIN_AARCH_64_PLATFORM fail( "no protoc build found for host platform with constraints: " + ", ".join(HOST_CONSTRAINTS), ) +def _adjust_protoc_platform(platform): + return platform if platform != _WIN_AARCH_64_PLATFORM else "win64" + def _platform_build(platform): + orig_platform = platform + platform = _adjust_protoc_platform(platform) + if platform not in PROTOC_BUILDS: - fail("no protoc build found for platform: " + platform) + fail("no protoc build found for platform: " + orig_platform) protoc_build = PROTOC_BUILDS[platform] if PROTOC_VERSION not in protoc_build["integrity"]: fail( "no protoc %s build found for platform: %s" % - (PROTOC_VERSION, platform), + (PROTOC_VERSION, orig_platform), ) + elif orig_platform == _WIN_AARCH_64_PLATFORM: + return protoc_build | { + "exec_compat": [ + "@platforms//os:windows", + "@platforms//cpu:aarch64", + ], + } return protoc_build def _download_build(repository_ctx, platform, protoc_build): repository_ctx.download_and_extract( url = PROTOC_DOWNLOAD_URL.format( - platform = platform, + platform = _adjust_protoc_platform(platform), version = PROTOC_VERSION, ), output = platform, diff --git a/scala/latest_deps.bzl b/scala/latest_deps.bzl index cb4bf5ce7..0ae3ab0c3 100644 --- a/scala/latest_deps.bzl +++ b/scala/latest_deps.bzl @@ -30,17 +30,17 @@ def rules_scala_dependencies(): http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/8.15.0/rules_java-8.15.0.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/8.15.1/rules_java-8.15.1.tar.gz", ], - sha256 = "0a7e8811cac04b553f6c6c0d185046e3c68a4cb774e83f37a7a5fb6a3deee261", + sha256 = "9b04cbbb0fee0632aeba628159938484cfadf4a9d2f5b1c356e8300c56467896", ) maybe( http_archive, name = "com_google_protobuf", - sha256 = "c3a0a9ece8932e31c3b736e2db18b1c42e7070cd9b881388b26d01aa71e24ca2", - strip_prefix = "protobuf-31.1", - url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v31.1.tar.gz", + sha256 = "3ad017543e502ffaa9cd1f4bd4fe96cf117ce7175970f191705fa0518aff80cd", + strip_prefix = "protobuf-32.0", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v32.0.tar.gz", patches = [Label("//protoc:0001-protobuf-19679-rm-protoc-dep.patch")], patch_args = ["-p1"], ) @@ -53,30 +53,12 @@ def rules_scala_dependencies(): url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz", ) - # 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.8" - rules_jvm_external_sha = ( - "704a0197e4e966f96993260418f2542568198490456c21814f647ae7091f56f2" - ) - maybe( - 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, - ), - ) - maybe( http_archive, name = "rules_python", - sha256 = "0e68f851a6fcf317eeab5f6dc79803cb183d30c0c65fb52e2c4b731d13b73349", - strip_prefix = "rules_python-1.5.2", - url = "https://github.com/bazelbuild/rules_python/releases/download/1.5.2/rules_python-1.5.2.tar.gz", + sha256 = "0a1cefefb4a7b550fb0b43f54df67d6da95b7ba352637669e46c987f69986f6a", + strip_prefix = "rules_python-1.5.3", + url = "https://github.com/bazelbuild/rules_python/releases/download/1.5.3/rules_python-1.5.3.tar.gz", ) maybe( diff --git a/scala/private/phases/phase_write_executable.bzl b/scala/private/phases/phase_write_executable.bzl index f58917a69..a8413329e 100644 --- a/scala/private/phases/phase_write_executable.bzl +++ b/scala/private/phases/phase_write_executable.bzl @@ -26,7 +26,6 @@ def phase_write_executable_scalatest(ctx, p): args = struct( rjars = p.coverage_runfiles.rjars, jvm_flags = [ - "-DRULES_SCALA_MAIN_WS_NAME=%s" % ctx.workspace_name, "-DRULES_SCALA_ARGS_FILE=%s" % rlocationpath_from_file(ctx, p.runfiles.args_file), ] + expand_location(ctx, final_jvm_flags), use_jacoco = ctx.configuration.coverage_enabled, diff --git a/scripts/create_repository.py b/scripts/create_repository.py index b59856f6e..56598e978 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -32,8 +32,8 @@ SCALATEST_VERSION = "3.2.19" SCALAFMT_VERSION = "3.9.9" KIND_PROJECTOR_VERSION = "0.13.3" -PROTOBUF_JAVA_VERSION = "4.31.1" -JLINE_VERSION = '3.30.4' +PROTOBUF_JAVA_VERSION = "4.32.0" +JLINE_VERSION = '3.30.5' SCALAPB_VERSION = '1.0.0-alpha.1' PROTOC_BRIDGE_VERSION = '0.9.9' GRPC_VERSION = '1.74.0' diff --git a/scripts/update_protoc_integrity.py b/scripts/update_protoc_integrity.py index b5ca1a9a0..bcbb706d7 100755 --- a/scripts/update_protoc_integrity.py +++ b/scripts/update_protoc_integrity.py @@ -21,6 +21,7 @@ PROTOC_VERSIONS = [ + "32.0", "31.1", "31.0", "30.2", diff --git a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java index 9613ec5da..2e54dba59 100644 --- a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java +++ b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java @@ -1,5 +1,6 @@ package io.bazel.rulesscala.exe; +import com.google.devtools.build.runfiles.AutoBazelRepository; import com.google.devtools.build.runfiles.Runfiles; import io.bazel.rulesscala.io_utils.StreamCopy; import io.bazel.rulesscala.preconditions.Preconditions; @@ -8,11 +9,13 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.file.*; import java.util.Arrays; import java.util.List; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; +@AutoBazelRepository public class LauncherFileWriter { public static void main(String[] args) throws IOException { Preconditions.require(args.length == 6); @@ -38,10 +41,17 @@ public static void main(String[] args) throws IOException { .addJoinedValues("jvm_flags", "\t", jvmFlags) .build(); - Path launcher = - Paths.get(Runfiles.create().rlocation("bazel_tools/tools/launcher/launcher.exe")); + Runfiles runfiles = Runfiles.preload() + .withSourceRepository(AutoBazelRepository_LauncherFileWriter.NAME); + Path launcher = Paths.get( + runfiles.rlocation("bazel_tools/tools/launcher/launcher")); Path outPath = Paths.get(location); + if (! launcher.toFile().exists()) { + // Required by Bazel 7 on Windows. + launcher = Paths.get(launcher.toString() + ".exe"); + } + try (InputStream in = Files.newInputStream(launcher); OutputStream out = Files.newOutputStream(outPath)) { StreamCopy.copy(in, out); diff --git a/src/java/io/bazel/rulesscala/scala_test/Runner.java b/src/java/io/bazel/rulesscala/scala_test/Runner.java index 9f1162312..899b45cb2 100644 --- a/src/java/io/bazel/rulesscala/scala_test/Runner.java +++ b/src/java/io/bazel/rulesscala/scala_test/Runner.java @@ -1,5 +1,6 @@ package io.bazel.rulesscala.scala_test; +import com.google.devtools.build.runfiles.AutoBazelRepository; import com.google.devtools.build.runfiles.Runfiles; import java.io.File; import java.io.IOException; @@ -14,15 +15,13 @@ * unwrap runner's arguments from a file (passed via file to overcome command-line string limitation * on Windows) */ +@AutoBazelRepository public class Runner { /** * This is the name of the env var set by bazel when a user provides a `--test_filter` test option */ private static final String TESTBRIDGE_TEST_ONLY = "TESTBRIDGE_TEST_ONLY"; - /** This is the name of the system property used to pass the main workspace name */ - private static final String RULES_SCALA_MAIN_WS_NAME = "RULES_SCALA_MAIN_WS_NAME"; - /** * This is the name of the system property used to pass a short path of the file, which includes * org.scalatest.tools.Runner arguments @@ -44,17 +43,15 @@ private static String[] extendFromFileArgs(String[] args) throws IOException { if (runnerArgsFileKey == null || runnerArgsFileKey.trim().isEmpty()) throw new IllegalArgumentException(RULES_SCALA_ARGS_FILE + " is null or empty."); - String workspace = System.getProperty(RULES_SCALA_MAIN_WS_NAME); - if (workspace == null || workspace.trim().isEmpty()) - throw new IllegalArgumentException(RULES_SCALA_MAIN_WS_NAME + " is null or empty."); - - String runnerArgsFilePath = Runfiles.create().rlocation(runnerArgsFileKey); + Runfiles runfiles = Runfiles.preload() + .withSourceRepository(AutoBazelRepository_Runner.NAME); + String runnerArgsFilePath = runfiles.rlocation(runnerArgsFileKey); if (runnerArgsFilePath == null) throw new IllegalArgumentException("rlocation value is null for key: " + runnerArgsFileKey); List runnerArgs = Files.readAllLines(Paths.get(runnerArgsFilePath), Charset.forName("UTF-8")); - rlocateRunpathValue(workspace, runnerArgs); + rlocateRunpathValue(runfiles, runnerArgs); String[] runnerArgsArray = runnerArgs.toArray(new String[runnerArgs.size()]); @@ -83,12 +80,11 @@ private static String[] prependFromEnvVar( * Replaces ScalaTest Runner's runpath elements paths (see * http://www.scalatest.org/user_guide/using_the_runner) with values from Bazel's runfiles */ - private static void rlocateRunpathValue(String rulesWorkspace, List runnerArgs) - throws IOException { + private static void rlocateRunpathValue( + Runfiles runfiles, List runnerArgs) throws IOException { int runpathFlag = runnerArgs.indexOf("-R"); if (runpathFlag >= 0) { 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(runpathElements[i].toString()); } diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel index e3f8a74d7..d9a5752c2 100644 --- a/test_cross_build/MODULE.bazel +++ b/test_cross_build/MODULE.bazel @@ -59,12 +59,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/test_version/MODULE.bazel.template b/test_version/MODULE.bazel.template index c4e05016e..d801c06be 100644 --- a/test_version/MODULE.bazel.template +++ b/test_version/MODULE.bazel.template @@ -14,12 +14,12 @@ local_path_override( path = "../../deps/latest", ) -bazel_dep(name = "rules_java", version = "8.15.0") +bazel_dep(name = "rules_java", version = "8.15.1") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_shell", version = "0.5.1") bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) @@ -29,7 +29,7 @@ single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) scala_config = use_extension( diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl index cfd3dc7eb..5895481e8 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -67,8 +67,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.11:0.2.6", diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index 856086e8a..6bfab7dfd 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -52,8 +52,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.12:0.5.0", diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index d76c661cf..778403d1f 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -427,8 +427,8 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jspecify_jspecify": { "artifact": "org.jspecify:jspecify:1.0.0", diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index 18cb4ecc0..6e8e0c259 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -435,38 +435,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index fff9825f4..cfc0f36db 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -435,38 +435,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 3ec2d89c1..96eaf3826 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -451,38 +451,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index a4b777dd4..8aaaf75ad 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -442,38 +442,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index c2edb8ce7..d6c3a04b1 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -442,38 +442,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_6.bzl b/third_party/repositories/scala_3_6.bzl index a310dce50..9db1d38a4 100644 --- a/third_party/repositories/scala_3_6.bzl +++ b/third_party/repositories/scala_3_6.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -451,38 +451,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/repositories/scala_3_7.bzl b/third_party/repositories/scala_3_7.bzl index 4ce26546d..5b5993546 100644 --- a/third_party/repositories/scala_3_7.bzl +++ b/third_party/repositories/scala_3_7.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.31.1", - "sha256": "d60dfe7c68a0d38a248cca96924f289dc7e1966a887ee7cae397701af08575ae", + "artifact": "com.google.protobuf:protobuf-java:4.32.0", + "sha256": "e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", @@ -451,38 +451,38 @@ artifacts = { "sha256": "c720e6e5bcbe6b2f48ded75a47bccdb763eede79d14330102e0d352e3d89ed92", }, "org_jline_jline": { - "artifact": "org.jline:jline:jar:jdk8:3.30.4", - "sha256": "4d650bd3930b3e7ed35f3c362bf449287597bca79ae3762d4dfa965e934b2ea0", + "artifact": "org.jline:jline:jar:jdk8:3.30.5", + "sha256": "dfcd5a6229332286407912ac8ec9380dabc160a9effa01f583eb565654f728ff", }, "org_jline_jline_native": { - "artifact": "org.jline:jline-native:3.30.4", - "sha256": "12075e489a0a70c14885b864a73a70f1da479bc1325522374e0cf53032f66fe9", + "artifact": "org.jline:jline-native:3.30.5", + "sha256": "cd1eba2f366b695cb39294538433a946bb9c662685ed4f134c78b5ba0cacca74", }, "org_jline_jline_reader": { - "artifact": "org.jline:jline-reader:3.30.4", - "sha256": "6989455b7a250698451f08cc59d3797f0fb581eb451e0fae4305a43473b8a668", + "artifact": "org.jline:jline-reader:3.30.5", + "sha256": "e023c683023c7e5692530364fde63d20c4597cf5ef7dcd7c6f6541e5aeb81c16", "deps": [ "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal": { - "artifact": "org.jline:jline-terminal:3.30.4", - "sha256": "1131990dddfd04b27df96ecdb71cfe098a0af2f6285af7359c38174887dc3527", + "artifact": "org.jline:jline-terminal:3.30.5", + "sha256": "4e871b40d2ce03bbb1f8713d6a3a268bf66c82164529756e8223f0e311a8ed96", "deps": [ "@org_jline_jline_native", ], }, "org_jline_jline_terminal_jna": { - "artifact": "org.jline:jline-terminal-jna:3.30.4", - "sha256": "ad933466333d24c8b9acd8af903d8443a21804566a7a84591a49aba4c6dc9927", + "artifact": "org.jline:jline-terminal-jna:3.30.5", + "sha256": "60e8720d7fc866fa51f01256771a6daae79cd622e097f838caec1e2dbce3cf31", "deps": [ "@net_java_dev_jna_jna", "@org_jline_jline_terminal", ], }, "org_jline_jline_terminal_jni": { - "artifact": "org.jline:jline-terminal-jni:3.30.4", - "sha256": "23c4a1631d005c22a509536ae14e1aa3c07fb6a958ac083f1221b9e9db7b2932", + "artifact": "org.jline:jline-terminal-jni:3.30.5", + "sha256": "73929d2331cb72fcb35b18b05ef740150cdc5cc18e414677685635c15b71e500", "deps": [ "@org_jline_jline_native", "@org_jline_jline_terminal", diff --git a/third_party/test/example_external_workspace/MODULE.bazel b/third_party/test/example_external_workspace/MODULE.bazel index 90f9816d2..d91956d30 100644 --- a/third_party/test/example_external_workspace/MODULE.bazel +++ b/third_party/test/example_external_workspace/MODULE.bazel @@ -32,12 +32,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", ) diff --git a/third_party/test/proto/MODULE.bazel b/third_party/test/proto/MODULE.bazel index 3c3332310..f6ec66402 100644 --- a/third_party/test/proto/MODULE.bazel +++ b/third_party/test/proto/MODULE.bazel @@ -39,12 +39,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "31.1", + version = "32.0", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "31.1", + version = "32.0", )