bump buildifier in bazelci and correct new lints (#2749)

aaronsky · web-flow · commit 717c51ea7706 · 2025-07-06T21:43:06.000Z
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -58,4 +58,4 @@ tasks:
     test_targets:
     - "doc/..."
 
-buildifier: 6.4.0
+buildifier: 8.2.1
diff --git a/apple/BUILD b/apple/BUILD
@@ -111,6 +111,7 @@ bzl_library(
         "@bazel_skylib//lib:dicts",
         "@bazel_skylib//lib:paths",
         "@build_bazel_apple_support//lib:apple_support",
+        "@rules_cc//cc/common",
     ],
 )
 
diff --git a/apple/apple_static_library.bzl b/apple/apple_static_library.bzl
@@ -14,6 +14,7 @@
 
 """apple_static_library Starlark implementation"""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "ApplePlatformInfo",
diff --git a/apple/cc_toolchain_forwarder.bzl b/apple/cc_toolchain_forwarder.bzl
@@ -17,6 +17,7 @@ A rule for handling the cc_toolchains and their constraints for a potential "fat
 """
 
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//apple:providers.bzl", "ApplePlatformInfo")
 load("//apple/internal:providers.bzl", "new_appleplatforminfo")
 
diff --git a/apple/dtrace.bzl b/apple/dtrace.bzl
@@ -26,6 +26,8 @@ load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple/internal/utils:bundle_paths.bzl",
     "bundle_paths",
diff --git a/apple/internal/BUILD b/apple/internal/BUILD
@@ -838,6 +838,7 @@ bzl_library(
     ],
     deps = [
         "@build_bazel_rules_swift//swift",
+        "@rules_cc//cc/common",
     ],
 )
 
diff --git a/apple/internal/apple_framework_import.bzl b/apple/internal/apple_framework_import.bzl
@@ -36,6 +36,7 @@ load(
     "swift_clang_module_aspect",
     "swift_common",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleFrameworkImportInfo",
diff --git a/apple/internal/apple_xcframework_import.bzl b/apple/internal/apple_xcframework_import.bzl
@@ -23,6 +23,7 @@ load(
     "swift_clang_module_aspect",
     "swift_common",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//apple:providers.bzl", "AppleFrameworkImportInfo")
 load(
     "//apple/internal:apple_toolchains.bzl",
diff --git a/apple/internal/aspects/swift_dynamic_framework_aspect.bzl b/apple/internal/aspects/swift_dynamic_framework_aspect.bzl
@@ -18,6 +18,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 SwiftDynamicFrameworkInfo = provider(
     fields = {
diff --git a/apple/internal/cc_info_support.bzl b/apple/internal/cc_info_support.bzl
@@ -14,6 +14,8 @@
 
 """Support methods for handling artifacts from CcInfo providers."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+
 def _get_all_deps(*, deps, split_deps_keys = []):
     """Returns a list of all dependencies from a Label list and optional split attribute keys.
 
diff --git a/apple/internal/framework_import_support.bzl b/apple/internal/framework_import_support.bzl
@@ -21,6 +21,8 @@ load(
     "swift_common",
 )
 load("@build_bazel_rules_swift//swift:swift_interop_info.bzl", "create_swift_interop_info")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//apple:providers.bzl", "AppleFrameworkImportInfo")
 load("//apple:utils.bzl", "group_files_by_directory")
 load("//apple/internal:providers.bzl", "new_appleframeworkimportinfo")
diff --git a/apple/internal/header_map.bzl b/apple/internal/header_map.bzl
@@ -16,6 +16,8 @@
 
 load("@build_bazel_rules_swift//swift:providers.bzl", "SwiftInfo")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_common")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 HeaderMapInfo = provider(
     doc = "Provides information about created `.hmap` (header map) files",
diff --git a/apple/internal/ios_rules.bzl b/apple/internal/ios_rules.bzl
@@ -17,6 +17,8 @@
 load("@bazel_skylib//lib:collections.bzl", "collections")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleBundleInfo",
diff --git a/apple/internal/linking_support.bzl b/apple/internal/linking_support.bzl
@@ -19,6 +19,8 @@ load(
     "paths",
 )
 load("@build_bazel_apple_support//lib:lipo.bzl", "lipo")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple/internal:cc_toolchain_info_support.bzl",
     "cc_toolchain_info_support",
diff --git a/apple/internal/macos_rules.bzl b/apple/internal/macos_rules.bzl
@@ -19,6 +19,8 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleBinaryInfoplistInfo",
diff --git a/apple/internal/multi_arch_binary_support.bzl b/apple/internal/multi_arch_binary_support.bzl
@@ -14,6 +14,8 @@
 
 """Support utility for creating multi-arch Apple binaries."""
 
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+
 visibility([
     "//apple/...",
 ])
diff --git a/apple/internal/partials/app_intents_metadata_bundle.bzl b/apple/internal/partials/app_intents_metadata_bundle.bzl
@@ -15,6 +15,7 @@
 """Partial implementation for processing AppIntents metadata bundle."""
 
 load("@bazel_skylib//lib:partial.bzl", "partial")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//apple/internal:intermediates.bzl", "intermediates")
 load("//apple/internal:linking_support.bzl", "linking_support")
 load("//apple/internal:processor.bzl", "processor")
diff --git a/apple/internal/partials/cc_info_dylibs.bzl b/apple/internal/partials/cc_info_dylibs.bzl
@@ -15,6 +15,7 @@
 """Partial implementation for gathering cc_info dylibs."""
 
 load("@bazel_skylib//lib:partial.bzl", "partial")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple/internal:processor.bzl",
     "processor",
diff --git a/apple/internal/partials/framework_provider.bzl b/apple/internal/partials/framework_provider.bzl
@@ -22,6 +22,8 @@ load(
     "@bazel_skylib//lib:paths.bzl",
     "paths",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//apple/internal:providers.bzl", "new_appledynamicframeworkinfo")
 
 def _framework_provider_partial_impl(
diff --git a/apple/internal/resource_rules/apple_resource_bundle.bzl b/apple/internal/resource_rules/apple_resource_bundle.bzl
@@ -14,6 +14,7 @@
 
 """Implementation of apple_resource_bundle rule."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple/internal:providers.bzl",
     "new_appleresourcebundleinfo",
diff --git a/apple/internal/rule_attrs.bzl b/apple/internal/rule_attrs.bzl
@@ -26,6 +26,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load(
     "//apple:common.bzl",
     "entitlements_validation_mode",
diff --git a/apple/internal/testing/apple_test_bundle_support.bzl b/apple/internal/testing/apple_test_bundle_support.bzl
@@ -22,6 +22,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleBundleInfo",
diff --git a/apple/internal/tvos_rules.bzl b/apple/internal/tvos_rules.bzl
@@ -19,6 +19,8 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleBundleInfo",
diff --git a/apple/internal/visionos_rules.bzl b/apple/internal/visionos_rules.bzl
@@ -19,6 +19,8 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple/internal:apple_product_type.bzl",
     "apple_product_type",
diff --git a/apple/internal/watchos_rules.bzl b/apple/internal/watchos_rules.bzl
@@ -23,6 +23,8 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//apple:providers.bzl",
     "AppleBundleInfo",
diff --git a/apple/resources.bzl b/apple/resources.bzl
@@ -185,7 +185,7 @@ def objc_intent_library(
         tags = ["manual"],
         testonly = testonly,
     )
-    native.objc_library(
+    objc_library(
         name = name,
         srcs = [intent_srcs],
         hdrs = [intent_hdrs],
diff --git a/examples/ios/Squarer/BUILD b/examples/ios/Squarer/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load("//apple:ios.bzl", "ios_unit_test")
 
 licenses(["notice"])
diff --git a/test/starlark_tests/resources/BUILD b/test/starlark_tests/resources/BUILD
@@ -2,6 +2,9 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_library",
 )
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_import.bzl", "cc_import")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load(
     "//apple:resources.bzl",
diff --git a/test/starlark_tests/resources/kext_resources/BUILD b/test/starlark_tests/resources/kext_resources/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load(
     "//test/starlark_tests:common.bzl",
     "common",
diff --git a/test/starlark_tests/targets_under_test/apple/BUILD b/test/starlark_tests/targets_under_test/apple/BUILD
@@ -3,6 +3,7 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_library",
 )
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(
diff --git a/test/starlark_tests/targets_under_test/dtrace/BUILD b/test/starlark_tests/targets_under_test/dtrace/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load(
     "//apple:dtrace.bzl",
     "dtrace_compile",
diff --git a/test/testdata/binaries/BUILD b/test/testdata/binaries/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load(
     "//apple:apple_binary.bzl",
     "apple_binary",

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ bzl_library(`
`111`	`111`	`"@bazel_skylib//lib:dicts",`
`112`	`112`	`"@bazel_skylib//lib:paths",`
`113`	`113`	`"@build_bazel_apple_support//lib:apple_support",`
	`114`	`+ "@rules_cc//cc/common",`
`114`	`115`	`],`
`115`	`116`	`)`
`116`	`117`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ load(`
`26`	`26`	`"@build_bazel_apple_support//lib:apple_support.bzl",`
`27`	`27`	`"apple_support",`
`28`	`28`	`)`
	`29`	`+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")`
	`30`	`+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")`
`29`	`31`	`load(`
`30`	`32`	`"//apple/internal/utils:bundle_paths.bzl",`
`31`	`33`	`"bundle_paths",`
Original file line number	Diff line number	Diff line change
`@@ -838,6 +838,7 @@ bzl_library(`
`838`	`838`	`],`
`839`	`839`	`deps = [`
`840`	`840`	`"@build_bazel_rules_swift//swift",`
	`841`	`+ "@rules_cc//cc/common",`
`841`	`842`	`],`
`842`	`843`	`)`
`843`	`844`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ load(`
`36`	`36`	`"swift_clang_module_aspect",`
`37`	`37`	`"swift_common",`
`38`	`38`	`)`
	`39`	`+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")`
`39`	`40`	`load(`
`40`	`41`	`"//apple:providers.bzl",`
`41`	`42`	`"AppleFrameworkImportInfo",`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ load(`
`23`	`23`	`"swift_clang_module_aspect",`
`24`	`24`	`"swift_common",`
`25`	`25`	`)`
	`26`	`+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")`
`26`	`27`	`load("//apple:providers.bzl", "AppleFrameworkImportInfo")`
`27`	`28`	`load(`
`28`	`29`	`"//apple/internal:apple_toolchains.bzl",`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ load(`
`18`	`18`	`"@build_bazel_rules_swift//swift:swift.bzl",`
`19`	`19`	`"SwiftInfo",`
`20`	`20`	`)`
	`21`	`+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")`
`21`	`22`
`22`	`23`	`SwiftDynamicFrameworkInfo = provider(`
`23`	`24`	`fields = {`