diff --git a/.bazelrc b/.bazelrc index 3e096a284..0aecd9e5a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,3 +1,5 @@ +# TODO: opt-in to bzlmod when ready +common --noenable_bzlmod common --jvmopt=-Djava.security.manager=allow build --java_language_version=17 diff --git a/.bazelversion b/.bazelversion index 19b860c18..a3fcc7121 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.4.0 +7.1.0 diff --git a/WORKSPACE b/WORKSPACE index 0904d6ee0..40e997045 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,5 +1,20 @@ workspace(name = "build_stack_rules_proto") +# Override transitives with Minimal versions that support Bazel 7 +# FIXME: figure out where these are being transitively loaded and update those sites instead +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "build_bazel_rules_apple", + sha256 = "20da675977cb8249919df14d0ce6165d7b00325fb067f0b06696b893b90a55e8", + url = "https://github.com/bazelbuild/rules_apple/releases/download/3.0.0/rules_apple.3.0.0.tar.gz", +) +http_archive( + name = "build_bazel_apple_support", + sha256 = "9f7bb62c3ae889e0eae8c18458fd8764e2e537687d9a1d85885d6af980e4fc31", + url = "https://github.com/bazelbuild/apple_support/releases/download/1.6.0/apple_support.1.6.0.tar.gz", +) + # gazelle:repo bazel_gazelle # ---------------------------------------------------- @@ -283,6 +298,10 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories") node_repositories() +load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") + +rules_js_dependencies() + # ---------------------------------------------------- # proto_repositories # ---------------------------------------------------- diff --git a/deps/BUILD.bazel b/deps/BUILD.bazel index f05a54bc8..779aa4529 100644 --- a/deps/BUILD.bazel +++ b/deps/BUILD.bazel @@ -410,9 +410,9 @@ proto_dependency( proto_dependency( name = "aspect_rules_js", repository_rule = "http_archive", - sha256 = "e3e6c3d42491e2938f4239a3d04259a58adc83e21e352346ad4ef62f87e76125", - strip_prefix = "rules_js-1.30.0", - urls = ["https://github.com/aspect-build/rules_js/releases/download/v1.30.0/rules_js-v1.30.0.tar.gz"], + sha256 = "7b2a4d1d264e105eae49a27e2e78065b23e2e45724df2251eacdd317e95bfdfd", + strip_prefix = "rules_js-1.31.0", + urls = ["https://github.com/aspect-build/rules_js/releases/download/v1.31.0/rules_js-v1.31.0.tar.gz"], deps = ["aspect_bazel_lib"], ) diff --git a/deps/ts_proto_deps.bzl b/deps/ts_proto_deps.bzl index 10ee36e88..f451442f2 100644 --- a/deps/ts_proto_deps.bzl +++ b/deps/ts_proto_deps.bzl @@ -31,10 +31,10 @@ def aspect_rules_js(): _maybe( http_archive, name = "aspect_rules_js", - sha256 = "e3e6c3d42491e2938f4239a3d04259a58adc83e21e352346ad4ef62f87e76125", - strip_prefix = "rules_js-1.30.0", + sha256 = "7b2a4d1d264e105eae49a27e2e78065b23e2e45724df2251eacdd317e95bfdfd", + strip_prefix = "rules_js-1.31.0", urls = [ - "https://github.com/aspect-build/rules_js/releases/download/v1.30.0/rules_js-v1.30.0.tar.gz", + "https://github.com/aspect-build/rules_js/releases/download/v1.31.0/rules_js-v1.31.0.tar.gz", ], )