Remove 7.x support (#2891)

Author: keith

.bazelci/presubmit.yml

@@ -32,6 +32,11 @@ x_defaults:
 # NOTE: To avoid listing the same things for build_flags/test_flags for each
 # of these tasks, they are listed in the .bazelrc instead.
 tasks:
+  macos_8.0.0:
+    name: "8.0.0"
+    bazel: 8.0.0
+    <<: *common
+
   macos_8.x:
     name: "8.x"
     bazel: 8.x

MODULE.bazel

@@ -3,7 +3,7 @@
 module(
     name = "rules_apple",
     version = "0",
-    bazel_compatibility = [">=7.0.0"],
+    bazel_compatibility = [">=8.0.0"],
     compatibility_level = 1,
 )
 

README.md

@@ -71,9 +71,11 @@ Besides these constraints this repo follows
 
 | Bazel release | Minimum supported rules version | Final supported rules version | Supporting Branch |
 |:-------------------:|:-------------------:|:-------------------------:|:-------------------------:|
-| 8.x (most recent rolling) | 2.* | current | `main` |
-| 7.x | 2.* | current | `main` |
-| 6.x | 2.* | 3.13.0 | `main` |
+| 10.x (most recent rolling) | 2.* | current | `main` |
+| 9.x | 2.* | current | `main` |
+| 8.x | 2.* | current | `main` |
+| 7.x | 2.* | 4.5.1 | `bazel/7.x` |
+| 6.x | 2.* | 3.13.0 | N/A |
 | 5.x | 0.33.0 | 1.* | `bazel/5.x` |
 | 4.x | 0.30.0 | 0.32.0 | N/A |
 | 3.x | 0.20.0 | 0.21.2 | N/A |

apple/internal/aspects/resource_aspect_hint.bzl

@@ -75,11 +75,6 @@ Available actions are
 Defines an aspect hint that generates an appropriate AppleResourceHintInfo based on the
 runfiles for this target.
 
-> [!NOTE]
-> Bazel 6 users must set the `--experimental_enable_aspect_hints` flag to utilize
-> this rule. In addition, downstream consumers of rules that utilize this rule
-> must also set the flag. The flag is enabled by default in Bazel 7.
-
 Some rules like `cc_library` may have data associated with them in the data attribute
 that is needed at runtime. If the library was linked in a `cc_binary` then those data
 files would be made available to the application as `runfiles`. To control this

apple/internal/linking_support.bzl

@@ -68,11 +68,6 @@ def _archive_multi_arch_static_library(
                 - environment: Static library archive environment (e.g. 'device', 'simulator').
     """
 
-    # TODO: Delete when we drop bazel 7.x
-    legacy_linking_function = getattr(apple_common, "link_multi_arch_static_library", None)
-    if legacy_linking_function:
-        return legacy_linking_function(ctx = ctx)
-
     split_deps = ctx.split_attr.deps
     split_avoid_deps = ctx.split_attr.avoid_deps
 
@@ -203,20 +198,6 @@ def _link_multi_arch_binary(
         *   `debug_outputs_provider`: An AppleDebugOutputs provider
     """
 
-    # TODO: Delete when we drop bazel 7.x
-    legacy_linking_function = getattr(apple_common, "link_multi_arch_binary", None)
-    if legacy_linking_function:
-        return legacy_linking_function(
-            ctx = ctx,
-            avoid_deps = avoid_deps,
-            extra_linkopts = extra_linkopts,
-            extra_link_inputs = extra_link_inputs,
-            extra_requested_features = extra_requested_features,
-            extra_disabled_features = extra_disabled_features,
-            variables_extension = variables_extension,
-            stamp = stamp,
-        )
-
     split_deps = ctx.split_attr.deps
 
     if split_deps and split_deps.keys() != cc_toolchains.keys():

apple/internal/providers.bzl

@@ -229,7 +229,7 @@ dependencies of the given target if any were generated.
     init = _make_banned_init(provider_name = "AppleDsymBundleInfo"),
 )
 
-_AppleDynamicFrameworkInfo = provider(
+AppleDynamicFrameworkInfo, new_appledynamicframeworkinfo = provider(
     doc = "Contains information about an Apple dynamic framework.",
     fields = {
         "framework_dirs": """\
@@ -246,37 +246,15 @@ A `CcInfo` which contains information about the transitive dependencies linked
 into the binary.
 """,
     },
+    init = _make_banned_init(provider_name = "AppleDynamicFrameworkInfo"),
 )
 
-# TODO: Remove when we drop 7.x
-AppleDynamicFrameworkInfo = getattr(
-    apple_common,
-    "AppleDynamicFramework",
-    _AppleDynamicFrameworkInfo,
-)
-
-# TODO: Remove when we drop 7.x
-def new_appledynamicframeworkinfo(**kwargs):
-    legacy_initializer = getattr(
-        apple_common,
-        "new_dynamic_framework_provider",
-        None,
-    )
-    if legacy_initializer:
-        return legacy_initializer(**kwargs)
-
-    return AppleDynamicFrameworkInfo(**kwargs)
-
-_AppleExecutableBinaryInfo = provider(
+AppleExecutableBinaryInfo, new_appleexecutablebinaryinfo = provider(
     doc = """
 Contains the executable binary output that was built using
 `link_multi_arch_binary` with the `executable` binary type.
 """,
     fields = {
-        # TODO: Remove when we drop 7.x
-        "objc": """\
-apple_common.Objc provider used for legacy linking behavior.
-""",
         "binary": """\
 The executable binary artifact output by `link_multi_arch_binary`.
 """,
@@ -285,18 +263,9 @@ A `CcInfo` which contains information about the transitive dependencies linked
 into the binary.
 """,
     },
+    init = _make_banned_init(provider_name = "AppleExecutableBinaryInfo"),
 )
 
-AppleExecutableBinaryInfo = getattr(apple_common, "AppleExecutableBinary", _AppleExecutableBinaryInfo)
-
-# TODO: Use common init pattern when we drop 7.x
-def new_appleexecutablebinaryinfo(**kwargs):
-    legacy_initializer = getattr(apple_common, "new_executable_binary_provider", None)
-    if legacy_initializer:
-        return legacy_initializer(**kwargs)
-
-    return AppleExecutableBinaryInfo(**kwargs)
-
 AppleExtraOutputsInfo, new_appleextraoutputsinfo = provider(
     doc = """
 Provides information about extra outputs that should be produced from the build.

apple/internal/rule_attrs.bzl

@@ -125,12 +125,6 @@ def _common_linking_api_attrs(*, deps_cfg):
             providers = [cc_common.CcToolchainInfo, ApplePlatformInfo],
             default = "//apple:default_cc_toolchain_forwarder",
         ),
-        # TODO: Remove this when we drop bazel 7.x
-        "_child_configuration_dummy": attr.label(
-            cfg = deps_cfg,
-            providers = [cc_common.CcToolchainInfo, ApplePlatformInfo],
-            default = "//apple:default_cc_toolchain_forwarder",
-        ),
     })
 
 def _static_library_archive_attrs(*, deps_cfg):

apple/internal/transition_support.bzl

@@ -43,7 +43,6 @@ load(
 )
 
 _supports_visionos = hasattr(apple_common.platform_type, "visionos")
-_is_bazel_7 = not hasattr(apple_common, "apple_crosstool_transition")
 
 _PLATFORM_TYPE_TO_CPUS_FLAG = {
     "ios": "//command_line_option:ios_multi_cpus",
@@ -335,7 +334,7 @@ def _command_line_options(
         settings = settings,
     )
 
-    default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]] if _is_bazel_7 else []
+    default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]]
     return {
         build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs],
         "//command_line_option:apple_platform_type": platform_type,

doc/providers.md

@@ -267,11 +267,17 @@ Provides information for an Apple dSYM bundle.
 <pre>
 load("@rules_apple//apple:providers.bzl", "AppleDynamicFrameworkInfo")
 
-AppleDynamicFrameworkInfo(<a href="#AppleDynamicFrameworkInfo-framework_dirs">framework_dirs</a>, <a href="#AppleDynamicFrameworkInfo-framework_files">framework_files</a>, <a href="#AppleDynamicFrameworkInfo-binary">binary</a>, <a href="#AppleDynamicFrameworkInfo-cc_info">cc_info</a>)
+AppleDynamicFrameworkInfo(<a href="#AppleDynamicFrameworkInfo-_init-kwargs">*kwargs</a>)
 </pre>
 
 Contains information about an Apple dynamic framework.
 
+**CONSTRUCTOR PARAMETERS**
+
+| Name  | Description | Default Value |
+| :------------- | :------------- | :------------- |
+| <a id="AppleDynamicFrameworkInfo-_init-kwargs"></a>kwargs | <p align="center">-</p> | none |
+
 **FIELDS**
 
 | Name  | Description |
@@ -289,17 +295,22 @@ Contains information about an Apple dynamic framework.
 <pre>
 load("@rules_apple//apple:providers.bzl", "AppleExecutableBinaryInfo")
 
-AppleExecutableBinaryInfo(<a href="#AppleExecutableBinaryInfo-objc">objc</a>, <a href="#AppleExecutableBinaryInfo-binary">binary</a>, <a href="#AppleExecutableBinaryInfo-cc_info">cc_info</a>)
+AppleExecutableBinaryInfo(<a href="#AppleExecutableBinaryInfo-_init-kwargs">*kwargs</a>)
 </pre>
 
 Contains the executable binary output that was built using
 `link_multi_arch_binary` with the `executable` binary type.
 
+**CONSTRUCTOR PARAMETERS**
+
+| Name  | Description | Default Value |
+| :------------- | :------------- | :------------- |
+| <a id="AppleExecutableBinaryInfo-_init-kwargs"></a>kwargs | <p align="center">-</p> | none |
+
 **FIELDS**
 
 | Name  | Description |
 | :------------- | :------------- |
-| <a id="AppleExecutableBinaryInfo-objc"></a>objc |  apple_common.Objc provider used for legacy linking behavior.    |
 | <a id="AppleExecutableBinaryInfo-binary"></a>binary |  The executable binary artifact output by `link_multi_arch_binary`.    |
 | <a id="AppleExecutableBinaryInfo-cc_info"></a>cc_info |  A `CcInfo` which contains information about the transitive dependencies linked into the binary.    |