Skip to content

Commit 56317c6

Browse files
authored
Fix bazelci on HEAD due to old dependency behavior (#2746)
- Bumped stardoc and removed overrides - Bumped protobuf to a version without a transitive dependency on a version of aspect_bazel_lib that invoked --incompatible_use_toolchain_transition - Bumped rules_cc to 0.1.2 to fix docs, corrected stardoc dep labels, updated docs
1 parent a9fcb1c commit 56317c6

19 files changed

Lines changed: 606 additions & 177 deletions

MODULE.bazel

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"""rules_apple MODULE.bazel file"""
2+
13
module(
24
name = "rules_apple",
35
version = "0",
@@ -6,10 +8,10 @@ module(
68
)
79

810
bazel_dep(name = "apple_support", version = "1.21.1", repo_name = "build_bazel_apple_support")
9-
bazel_dep(name = "bazel_features", version = "1.9.0")
10-
bazel_dep(name = "bazel_skylib", version = "1.3.0")
11-
bazel_dep(name = "platforms", version = "0.0.9")
12-
bazel_dep(name = "rules_cc", version = "0.0.10")
11+
bazel_dep(name = "bazel_features", version = "1.30.0")
12+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
13+
bazel_dep(name = "platforms", version = "0.0.11")
14+
bazel_dep(name = "rules_cc", version = "0.1.2")
1315
bazel_dep(
1416
name = "rules_swift",
1517
version = "2.4.0",
@@ -28,13 +30,13 @@ bazel_dep(name = "rules_shell", version = "0.3.0")
2830

2931
bazel_dep(
3032
name = "stardoc",
31-
version = "0.6.2",
33+
version = "0.8.0",
3234
dev_dependency = True,
3335
repo_name = "io_bazel_stardoc",
3436
)
3537
bazel_dep(
3638
name = "protobuf",
37-
version = "21.7",
39+
version = "29.0",
3840
dev_dependency = True,
3941
repo_name = "com_google_protobuf",
4042
)
@@ -50,20 +52,3 @@ use_repo(provisioning_profile_repository, "local_provisioning_profiles")
5052

5153
apple_cc_configure = use_extension("@build_bazel_apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
5254
use_repo(apple_cc_configure, "local_config_apple_cc")
53-
54-
# TODO: Remove override when a protobuf release is available that supports
55-
# Bazel 8
56-
archive_override(
57-
module_name = "protobuf",
58-
integrity = "sha256-+dloYVexGlGsxKLTARuU4KXZ5ORo/BWPR6obFk73d+Q=",
59-
strip_prefix = "protobuf-b93b8e5f64ed922d101759380d7c6a2bbe474e26",
60-
urls = ["https://github.com/protocolbuffers/protobuf/archive/b93b8e5f64ed922d101759380d7c6a2bbe474e26.zip"],
61-
)
62-
63-
# TODO: Remove override when a protobuf release that marks `stardoc` as a
64-
# dev_dependency is available, until then it's upgrading our stardoc version
65-
# so override it here.
66-
single_version_override(
67-
module_name = "stardoc",
68-
version = "0.6.2",
69-
)

WORKSPACE

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,15 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
3535

3636
bazel_skylib_workspace()
3737

38+
load("@rules_python//python:repositories.bzl", "py_repositories")
39+
40+
py_repositories()
41+
3842
# For API doc generation
3943
# This is a dev dependency, users should not need to install it
4044
# so we declare it in the WORKSPACE
41-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
42-
43-
http_archive(
44-
name = "rules_python",
45-
sha256 = "2cc26bbd53854ceb76dd42a834b1002cd4ba7f8df35440cf03482e045affc244",
46-
strip_prefix = "rules_python-1.3.0",
47-
url = "https://github.com/bazel-contrib/rules_python/releases/download/1.3.0/rules_python-1.3.0.tar.gz",
48-
)
49-
50-
load("@rules_python//python:repositories.bzl", "py_repositories")
5145

52-
py_repositories()
46+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5347

5448
http_archive(
5549
name = "io_bazel_stardoc",

apple/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ bzl_library(
184184
"//apple/internal/resource_rules:apple_precompiled_resource_bundle",
185185
"//apple/internal/resource_rules:apple_resource_bundle",
186186
"//apple/internal/resource_rules:apple_resource_group",
187-
"//apple/internal/resource_rules:apple_resource_locales",
188187
"@rules_cc//cc:core_rules",
189188
"@rules_cc//cc:find_cc_toolchain_bzl",
190189
"@rules_cc//cc/common",

apple/internal/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,7 @@ bzl_library(
812812
deps = [
813813
"//apple:providers",
814814
"//apple/internal/providers:apple_debug_info",
815+
"@build_bazel_apple_support//lib:apple_support",
815816
],
816817
)
817818

apple/internal/multi_arch_binary_support.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,4 @@ def subtract_linking_contexts(owner, linking_contexts, avoid_dep_linking_context
7575
linkstamps = depset(linkstamps),
7676
),
7777
]),
78-
owner = owner,
7978
)

0 commit comments

Comments
 (0)