Changes to fix apple_support for Bazel 9 (#497)

Needed to land: bazelbuild/rules_apple#2868

Author: luispadron

.bazelci/presubmit.yml

@@ -49,10 +49,10 @@ tasks:
 
   macos_latest:
     name: "Current LTS"
-    bazel: last_rc # TODO: switch back to latest once 9.x is released
+    bazel: last_rc
     <<: *common
 
-  # TODO: Re-enable once >10.0.0-pre.20251105.2 is available https://github.com/bazelbuild/bazel/issues/27749
+  # TODO: Enable ASAP when we remove usage of `//command_line_option:incompatible_enable_apple_toolchain_resolution`
   # macos_rolling:
   #   name: "Latest Rolling"
   #   bazel: rolling
@@ -66,10 +66,11 @@ tasks:
       - test/shell/layering_check_test.sh
       - test/shell/header_parsing_test.sh
 
-  macos_last_green:
-    name: "Last Green Bazel"
-    bazel: last_green
-    <<: *common
+  # TODO: Enable ASAP when we remove usage of `//command_line_option:incompatible_enable_apple_toolchain_resolution`
+  # macos_last_green:
+  #   name: "Last Green Bazel"
+  #   bazel: last_green
+  #   <<: *common
 
   linux_latest:
     name: "Current LTS"

MODULE.bazel

@@ -10,17 +10,7 @@ module(
 bazel_dep(name = "bazel_features", version = "1.27.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(name = "platforms", version = "0.0.9")
-bazel_dep(name = "rules_cc", version = "0.2.13")
-
-# NOTE: Not inherited but ok since this is only for tests
-single_version_override(
-    module_name = "rules_cc",
-    patch_strip = 1,
-    patches = [
-        # https://github.com/bazelbuild/rules_cc/pull/518
-        "//test:rules_cc.patch",
-    ],
-)
+bazel_dep(name = "rules_cc", version = "0.2.15")
 
 apple_cc_configure = use_extension("//crosstool:setup.bzl", "apple_cc_configure_extension")
 use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")

test/rules_cc.patch

@@ -17,12 +17,12 @@
 load("@bazel_features//:features.bzl", "bazel_features")
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("//xcode:available_xcodes.bzl", "available_xcodes")
-load("//xcode:xcode_config.bzl", "xcode_config")
-load("//xcode:xcode_version.bzl", "xcode_version")
 load(
-    "//xcode/private:providers.bzl",
+    "//xcode:providers.bzl",
     "XcodeVersionPropertiesInfo",
-)  # buildifier: disable=bzl-visibility
+)
+load("//xcode:xcode_config.bzl", "xcode_config")
+load("//xcode:xcode_version.bzl", "xcode_version")
 load(":test_helpers.bzl", "FIXTURE_TAGS", "find_action", "make_all_tests")
 
 visibility("private")

test/xcode_config_test.bzl

@@ -16,11 +16,11 @@
 
 load("@bazel_features//:features.bzl", "bazel_features")
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load("//xcode:xcode_version.bzl", "xcode_version")
 load(
-    "//xcode/private:providers.bzl",
+    "//xcode:providers.bzl",
     "XcodeVersionPropertiesInfo",
-)  # buildifier: disable=bzl-visibility
+)
+load("//xcode:xcode_version.bzl", "xcode_version")
 load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
 
 visibility("private")

test/xcode_version_test.bzl

@@ -33,62 +33,6 @@ The default Xcode version from `available_xcodes`.
     },
 )
 
-def _xcode_version_properties_info_init(
-        *,
-        xcode_version,
-        default_ios_sdk_version = "8.4",
-        default_macos_sdk_version = "10.11",
-        default_tvos_sdk_version = "9.0",
-        default_watchos_sdk_version = "2.0",
-        default_visionos_sdk_version = "1.0",
-        sdk_variant_info = None):
-    # Ensure that all fields get default values if they weren't specified.
-    return {
-        "xcode_version": xcode_version,
-        "default_ios_sdk_version": default_ios_sdk_version,
-        "default_macos_sdk_version": default_macos_sdk_version,
-        "default_tvos_sdk_version": default_tvos_sdk_version,
-        "default_watchos_sdk_version": default_watchos_sdk_version,
-        "default_visionos_sdk_version": default_visionos_sdk_version,
-        "sdk_variant_info": sdk_variant_info,
-    }
-
-XcodeVersionPropertiesInfo, _new_xcode_version_properties_info = provider(
-    doc = """\
-Information about a specific Xcode version, such as its default SDK versions.
-""",
-    fields = {
-        "xcode_version": """\
-A string representing the Xcode version number, or `None` if it is unknown.
-""",
-        "default_ios_sdk_version": """\
-A string representing the default iOS SDK version number for this version of
-Xcode, or `None` if it is unknown.
-""",
-        "default_macos_sdk_version": """\
-A string representing the default macOS SDK version number for this version of
-Xcode, or `None` if it is unknown.
-""",
-        "default_tvos_sdk_version": """\
-A string representing the default tvOS SDK version number for this version of
-Xcode, or `None` if it is unknown.
-""",
-        "default_watchos_sdk_version": """\
-A string representing the default watchOS SDK version number for this version of
-Xcode, or `None` if it is unknown.
-""",
-        "default_visionos_sdk_version": """\
-A string representing the default visionOS SDK version number for this version
-of Xcode, or `None` if it is unknown.
-""",
-        "sdk_variant_info": """\
-The `XcodeSdkVariantInfo` provider for the SDK in this version of Xcode to
-build with under the current target configuration, or `None` if it is unknown.
-""",
-    },
-    init = _xcode_version_properties_info_init,
-)
-
 XcodeVersionRuleInfo = provider(
     doc = """\
 The information in a single target of the `xcode_version` rule. A single target

xcode/private/providers.bzl

@@ -110,3 +110,59 @@ XcodeSdkVariantInfo = provider(
             """,
     },
 )
+
+def _xcode_version_properties_info_init(
+        *,
+        xcode_version,
+        default_ios_sdk_version = "8.4",
+        default_macos_sdk_version = "10.11",
+        default_tvos_sdk_version = "9.0",
+        default_watchos_sdk_version = "2.0",
+        default_visionos_sdk_version = "1.0",
+        sdk_variant_info = None):
+    # Ensure that all fields get default values if they weren't specified.
+    return {
+        "xcode_version": xcode_version,
+        "default_ios_sdk_version": default_ios_sdk_version,
+        "default_macos_sdk_version": default_macos_sdk_version,
+        "default_tvos_sdk_version": default_tvos_sdk_version,
+        "default_watchos_sdk_version": default_watchos_sdk_version,
+        "default_visionos_sdk_version": default_visionos_sdk_version,
+        "sdk_variant_info": sdk_variant_info,
+    }
+
+XcodeVersionPropertiesInfo, _new_xcode_version_properties_info = provider(
+    doc = """\
+Information about a specific Xcode version, such as its default SDK versions.
+""",
+    fields = {
+        "xcode_version": """\
+A string representing the Xcode version number, or `None` if it is unknown.
+""",
+        "default_ios_sdk_version": """\
+A string representing the default iOS SDK version number for this version of
+Xcode, or `None` if it is unknown.
+""",
+        "default_macos_sdk_version": """\
+A string representing the default macOS SDK version number for this version of
+Xcode, or `None` if it is unknown.
+""",
+        "default_tvos_sdk_version": """\
+A string representing the default tvOS SDK version number for this version of
+Xcode, or `None` if it is unknown.
+""",
+        "default_watchos_sdk_version": """\
+A string representing the default watchOS SDK version number for this version of
+Xcode, or `None` if it is unknown.
+""",
+        "default_visionos_sdk_version": """\
+A string representing the default visionOS SDK version number for this version
+of Xcode, or `None` if it is unknown.
+""",
+        "sdk_variant_info": """\
+The `XcodeSdkVariantInfo` provider for the SDK in this version of Xcode to
+build with under the current target configuration, or `None` if it is unknown.
+""",
+    },
+    init = _xcode_version_properties_info_init,
+)

xcode/providers.bzl

@@ -15,10 +15,13 @@
 """Implementation of the `xcode_config` build rule."""
 
 load("@bazel_features//:features.bzl", "bazel_features")
+load(
+    "@build_bazel_apple_support//xcode:providers.bzl",
+    "XcodeVersionPropertiesInfo",
+)
 load(
     "@build_bazel_apple_support//xcode/private:providers.bzl",
     "AvailableXcodesInfo",
-    "XcodeVersionPropertiesInfo",
     "XcodeVersionRuleInfo",
 )
 

xcode/xcode_config.bzl

@@ -18,10 +18,10 @@ load("@bazel_features//:features.bzl", "bazel_features")
 load(
     "@build_bazel_apple_support//xcode:providers.bzl",
     "XcodeSdkVariantInfo",
+    "XcodeVersionPropertiesInfo",
 )
 load(
     "@build_bazel_apple_support//xcode/private:providers.bzl",
-    "XcodeVersionPropertiesInfo",
     "XcodeVersionRuleInfo",
 )