Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove internal uses of @build_bazel_rules_apple #2614

Merged
merged 7 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module(
version = "0",
bazel_compatibility = [">=7.0.0"],
compatibility_level = 1,
repo_name = "build_bazel_rules_apple",
)

bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
Expand Down
14 changes: 7 additions & 7 deletions apple/apple.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@
"""# Rules that apply to all Apple platforms."""

load(
"@build_bazel_rules_apple//apple:apple_static_library.bzl",
"//apple:apple_static_library.bzl",
_apple_static_library = "apple_static_library",
)
load(
"@build_bazel_rules_apple//apple/internal:apple_framework_import.bzl",
"//apple/internal:apple_framework_import.bzl",
_apple_dynamic_framework_import = "apple_dynamic_framework_import",
_apple_static_framework_import = "apple_static_framework_import",
)
load(
"@build_bazel_rules_apple//apple/internal:apple_universal_binary.bzl",
"//apple/internal:apple_universal_binary.bzl",
_apple_universal_binary = "apple_universal_binary",
)
load(
"@build_bazel_rules_apple//apple/internal:apple_xcframework_import.bzl",
"//apple/internal:apple_xcframework_import.bzl",
_apple_dynamic_xcframework_import = "apple_dynamic_xcframework_import",
_apple_static_xcframework_import = "apple_static_xcframework_import",
)
load(
"@build_bazel_rules_apple//apple/internal:experimental_mixed_language_library.bzl",
"//apple/internal:experimental_mixed_language_library.bzl",
_experimental_mixed_language_library = "experimental_mixed_language_library",
)
load(
"@build_bazel_rules_apple//apple/internal:local_provisioning_profiles.bzl",
"//apple/internal:local_provisioning_profiles.bzl",
_local_provisioning_profile = "local_provisioning_profile",
_provisioning_profile_repository = "provisioning_profile_repository",
_provisioning_profile_repository_extension = "provisioning_profile_repository_extension",
)
load(
"@build_bazel_rules_apple//apple/internal:xcframework_rules.bzl",
"//apple/internal:xcframework_rules.bzl",
_apple_static_xcframework = "apple_static_xcframework",
_apple_xcframework = "apple_xcframework",
)
Expand Down
8 changes: 4 additions & 4 deletions apple/apple_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
"""Starlark implementation of `apple_binary` to transition from native Bazel."""

load(
"@build_bazel_rules_apple//apple/internal:linking_support.bzl",
"//apple/internal:linking_support.bzl",
"linking_support",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
"//apple/internal:rule_attrs.bzl",
"rule_attrs",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
"//apple/internal:rule_factory.bzl",
"rule_factory",
)
load(
"@build_bazel_rules_apple//apple/internal:transition_support.bzl",
"//apple/internal:transition_support.bzl",
"transition_support",
)

Expand Down
12 changes: 6 additions & 6 deletions apple/apple_static_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
"""apple_static_library Starlark implementation"""

load(
"@build_bazel_rules_apple//apple:providers.bzl",
"//apple:providers.bzl",
"ApplePlatformInfo",
)
load(
"@build_bazel_rules_apple//apple/internal:linking_support.bzl",
"//apple/internal:linking_support.bzl",
"linking_support",
)
load(
"@build_bazel_rules_apple//apple/internal:providers.bzl",
"//apple/internal:providers.bzl",
"new_applebinaryinfo",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
"//apple/internal:rule_attrs.bzl",
"rule_attrs",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
"//apple/internal:rule_factory.bzl",
"rule_factory",
)
load(
"@build_bazel_rules_apple//apple/internal:transition_support.bzl",
"//apple/internal:transition_support.bzl",
"transition_support",
)

Expand Down
2 changes: 1 addition & 1 deletion apple/aspects.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""Aspects that apply to all Apple platforms."""

load(
"@build_bazel_rules_apple//apple/internal/aspects:framework_provider_aspect.bzl",
"//apple/internal/aspects:framework_provider_aspect.bzl",
_framework_provider_aspect = "framework_provider_aspect",
)

Expand Down
2 changes: 1 addition & 1 deletion apple/capabilities.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""Rules related to Apple capabilities."""

load(
"@build_bazel_rules_apple//apple/internal:capabilities_rules.bzl",
"//apple/internal:capabilities_rules.bzl",
_apple_base_bundle_id = "apple_base_bundle_id",
_apple_capability_set = "apple_capability_set",
)
Expand Down
2 changes: 1 addition & 1 deletion apple/docc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""Defines rules for building Apple DocC targets."""

load(
"@build_bazel_rules_apple//apple/internal:docc.bzl",
"//apple/internal:docc.bzl",
_docc_archive = "docc_archive",
)

Expand Down
2 changes: 1 addition & 1 deletion apple/dtrace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ load(
"apple_support",
)
load(
"@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
"//apple/internal/utils:bundle_paths.bzl",
"bundle_paths",
)

Expand Down
2 changes: 1 addition & 1 deletion apple/header_map.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Rules for creating header maps.
"""

load(
"@build_bazel_rules_apple//apple/internal:header_map.bzl",
"//apple/internal:header_map.bzl",
_header_map = "header_map",
)

Expand Down
32 changes: 16 additions & 16 deletions apple/internal/apple_framework_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,51 +32,51 @@ load(
)
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
load(
"@build_bazel_rules_apple//apple:providers.bzl",
"@build_bazel_rules_swift//swift:swift.bzl",
"SwiftToolchainInfo",
"swift_clang_module_aspect",
"swift_common",
)
load(
"//apple:providers.bzl",
"AppleFrameworkImportInfo",
)
load(
"@build_bazel_rules_apple//apple:utils.bzl",
"//apple:utils.bzl",
"group_files_by_directory",
)
load(
"@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
"//apple/internal:apple_toolchains.bzl",
"AppleXPlatToolsToolchainInfo",
)
load(
"@build_bazel_rules_apple//apple/internal:cc_toolchain_info_support.bzl",
"//apple/internal:cc_toolchain_info_support.bzl",
"cc_toolchain_info_support",
)
load(
"@build_bazel_rules_apple//apple/internal:experimental.bzl",
"//apple/internal:experimental.bzl",
"is_experimental_tree_artifact_enabled",
)
load(
"@build_bazel_rules_apple//apple/internal:framework_import_support.bzl",
"//apple/internal:framework_import_support.bzl",
"framework_import_support",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
"//apple/internal:rule_attrs.bzl",
"rule_attrs",
)
load(
"@build_bazel_rules_apple//apple/internal/aspects:swift_usage_aspect.bzl",
"//apple/internal/aspects:swift_usage_aspect.bzl",
"SwiftUsageInfo",
)
load(
"@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
"//apple/internal/providers:framework_import_bundle_info.bzl",
"AppleFrameworkImportBundleInfo",
)
load(
"@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
"//apple/internal/utils:bundle_paths.bzl",
"bundle_paths",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"SwiftToolchainInfo",
"swift_clang_module_aspect",
"swift_common",
)

def _swiftmodule_for_cpu(swiftmodule_files, cpu):
"""Select the cpu specific swiftmodule."""
Expand Down
4 changes: 2 additions & 2 deletions apple/internal/apple_toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ def _shared_attrs():
"""Private attributes on every rule to provide access to bundling tools and other file deps."""
return {
"_mac_toolchain": attr.label(
default = Label("@build_bazel_rules_apple//apple/internal:mac_tools_toolchain"),
default = Label("//apple/internal:mac_tools_toolchain"),
providers = [[AppleMacToolsToolchainInfo]],
cfg = "exec",
),
"_xplat_toolchain": attr.label(
default = Label("@build_bazel_rules_apple//apple/internal:xplat_tools_toolchain"),
default = Label("//apple/internal:xplat_tools_toolchain"),
providers = [[AppleXPlatToolsToolchainInfo]],
cfg = "exec",
),
Expand Down
10 changes: 5 additions & 5 deletions apple/internal/apple_universal_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
"""Implementation for apple universal binary rules."""

load(
"@build_bazel_rules_apple//apple/internal:linking_support.bzl",
"//apple/internal:linking_support.bzl",
"linking_support",
)
load(
"@build_bazel_rules_apple//apple/internal:providers.bzl",
"//apple/internal:providers.bzl",
"new_applebinaryinfo",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
"//apple/internal:rule_attrs.bzl",
"rule_attrs",
)
load(
"@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
"//apple/internal:rule_factory.bzl",
"rule_factory",
)
load(
"@build_bazel_rules_apple//apple/internal:transition_support.bzl",
"//apple/internal:transition_support.bzl",
"transition_support",
)

Expand Down
20 changes: 10 additions & 10 deletions apple/internal/apple_xcframework_import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,35 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("@bazel_skylib//lib:paths.bzl", "paths")
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
load("@build_bazel_apple_support//lib:apple_support.bzl", "apple_support")
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftToolchainInfo", "swift_clang_module_aspect", "swift_common")
load("//apple:providers.bzl", "AppleFrameworkImportInfo")
load(
"@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
"//apple/internal:apple_toolchains.bzl",
"AppleMacToolsToolchainInfo",
"AppleXPlatToolsToolchainInfo",
)
load(
"@build_bazel_rules_apple//apple/internal:cc_toolchain_info_support.bzl",
"//apple/internal:cc_toolchain_info_support.bzl",
"cc_toolchain_info_support",
)
load(
"@build_bazel_rules_apple//apple/internal:experimental.bzl",
"//apple/internal:experimental.bzl",
"is_experimental_tree_artifact_enabled",
)
load(
"@build_bazel_rules_apple//apple/internal:framework_import_support.bzl",
"//apple/internal:framework_import_support.bzl",
"framework_import_support",
)
load("//apple/internal:intermediates.bzl", "intermediates")
load("//apple/internal:rule_attrs.bzl", "rule_attrs")
load(
"@build_bazel_rules_apple//apple/internal/aspects:swift_usage_aspect.bzl",
"//apple/internal/aspects:swift_usage_aspect.bzl",
"SwiftUsageInfo",
)
load(
"@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
"//apple/internal/providers:framework_import_bundle_info.bzl",
"AppleFrameworkImportBundleInfo",
)
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftToolchainInfo", "swift_clang_module_aspect", "swift_common")
load("//apple:providers.bzl", "AppleFrameworkImportInfo")
load("//apple/internal:intermediates.bzl", "intermediates")
load("//apple/internal:rule_attrs.bzl", "rule_attrs")

# Currently, XCFramework bundles can contain Apple frameworks or libraries.
# This defines an _enum_ to identify an imported XCFramework bundle type.
Expand Down
4 changes: 2 additions & 2 deletions apple/internal/aspects/framework_provider_aspect.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"""Implementation of the aspect that propagates framework providers."""

load(
"@build_bazel_rules_apple//apple:providers.bzl",
"//apple:providers.bzl",
"AppleFrameworkImportInfo",
"apple_provider",
)
load(
"@build_bazel_rules_apple//apple/internal/providers:embeddable_info.bzl",
"//apple/internal/providers:embeddable_info.bzl",
"AppleEmbeddableInfo",
"embeddable_info",
)
Expand Down
28 changes: 14 additions & 14 deletions apple/internal/aspects/resource_aspect.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -27,54 +27,54 @@ load(
"apple_support",
)
load(
"@build_bazel_rules_apple//apple:providers.bzl",
"@build_bazel_rules_swift//swift:swift.bzl",
"SwiftInfo",
)
load(
"//apple:providers.bzl",
"AppleDsymBundleInfo",
"AppleFrameworkBundleInfo",
"AppleResourceInfo",
)
load(
"@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
"//apple/internal:apple_toolchains.bzl",
"AppleMacToolsToolchainInfo",
"AppleXPlatToolsToolchainInfo",
"apple_toolchain_utils",
)
load(
"@build_bazel_rules_apple//apple/internal:features_support.bzl",
"//apple/internal:features_support.bzl",
"features_support",
)
load(
"@build_bazel_rules_apple//apple/internal:platform_support.bzl",
"//apple/internal:platform_support.bzl",
"platform_support",
)
load(
"@build_bazel_rules_apple//apple/internal:providers.bzl",
"//apple/internal:providers.bzl",
"new_appledsymbundleinfo",
)
load(
"@build_bazel_rules_apple//apple/internal:resources.bzl",
"//apple/internal:resources.bzl",
"resources",
)
load(
"@build_bazel_rules_apple//apple/internal:swift_support.bzl",
"//apple/internal:swift_support.bzl",
"swift_support",
)
load(
"@build_bazel_rules_apple//apple/internal/aspects:resource_aspect_hint.bzl",
"//apple/internal/aspects:resource_aspect_hint.bzl",
"AppleResourceHintInfo",
"apple_resource_hint_action",
)
load(
"@build_bazel_rules_apple//apple/internal/providers:apple_debug_info.bzl",
"//apple/internal/providers:apple_debug_info.bzl",
"AppleDebugInfo",
)
load(
"@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
"//apple/internal/providers:framework_import_bundle_info.bzl",
"AppleFrameworkImportBundleInfo",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"SwiftInfo",
)

def _platform_prerequisites_for_aspect(target, aspect_ctx):
"""Return the set of platform prerequisites that can be determined from this aspect."""
Expand Down
Loading
Loading