From 6db5fb055740fdeb95bbdcaa37214c5f1a6913e7 Mon Sep 17 00:00:00 2001 From: Erik Kerber Date: Fri, 12 Jul 2024 07:50:00 -0500 Subject: [PATCH] Sort load statements per buildifier 6.4.0 (#2499) Followup request from #2485 rules_apple is on buildifier 6.3.2, one version before load sorting improvements. Can update that too. --- apple/build_settings/BUILD | 2 +- apple/internal/BUILD | 10 +++--- apple/testing/default_runner/BUILD | 2 +- doc/BUILD.bazel | 2 +- examples/ios/HelloWorld/BUILD | 2 +- examples/ios/iMessageApp/BUILD | 8 ++--- examples/macos/CommandLineSwift/BUILD | 8 ++--- examples/macos/HelloWorldSwift/BUILD | 8 ++--- examples/macos/XPCServiceApp/BUILD | 8 ++--- examples/multi_platform/Buttons/BUILD | 8 ++--- examples/visionos/HelloWorld/BUILD | 2 +- test/BUILD | 10 +++--- test/starlark_tests/BUILD | 12 +++---- test/starlark_tests/resources/BUILD | 8 ++--- .../starlark_tests/resources/frameworks/BUILD | 2 +- .../targets_under_test/apple/BUILD | 26 +++++++-------- .../targets_under_test/ios/BUILD | 32 +++++++++---------- .../targets_under_test/macos/BUILD | 22 ++++++------- .../targets_under_test/tvos/BUILD | 24 +++++++------- .../targets_under_test/watchos/BUILD | 22 ++++++------- 20 files changed, 109 insertions(+), 109 deletions(-) diff --git a/apple/build_settings/BUILD b/apple/build_settings/BUILD index 5b5c08d3dc..6e36362a1a 100644 --- a/apple/build_settings/BUILD +++ b/apple/build_settings/BUILD @@ -1,7 +1,7 @@ # Build settings used throughout rules_apple build rules. -load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag") load("@bazel_skylib//:bzl_library.bzl", "bzl_library") +load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag") load( "//apple/build_settings:build_settings.bzl", "build_settings", diff --git a/apple/internal/BUILD b/apple/internal/BUILD index 15e1b3a8a5..56ca23e876 100644 --- a/apple/internal/BUILD +++ b/apple/internal/BUILD @@ -1,18 +1,18 @@ # Internal implementation details of the Apple rules. +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( - ":environment_plist.bzl", - "environment_plist", + "//apple/build_settings:build_settings.bzl", + "build_settings_labels", ) -load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( "//apple/internal:apple_toolchains.bzl", "apple_mac_tools_toolchain", "apple_xplat_tools_toolchain", ) load( - "//apple/build_settings:build_settings.bzl", - "build_settings_labels", + ":environment_plist.bzl", + "environment_plist", ) licenses(["notice"]) diff --git a/apple/testing/default_runner/BUILD b/apple/testing/default_runner/BUILD index 0c34d584a7..0bedc521fa 100644 --- a/apple/testing/default_runner/BUILD +++ b/apple/testing/default_runner/BUILD @@ -1,3 +1,4 @@ +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( "//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner", @@ -22,7 +23,6 @@ load( "//apple/testing/default_runner:watchos_test_runner.bzl", "watchos_test_runner", ) -load("@bazel_skylib//:bzl_library.bzl", "bzl_library") licenses(["notice"]) diff --git a/doc/BUILD.bazel b/doc/BUILD.bazel index 184176e86b..838a7f8d8a 100644 --- a/doc/BUILD.bazel +++ b/doc/BUILD.bazel @@ -1,5 +1,5 @@ -load("@bazel_skylib//rules:write_file.bzl", "write_file") load("@bazel_skylib//rules:diff_test.bzl", "diff_test") +load("@bazel_skylib//rules:write_file.bzl", "write_file") load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc") _PLAIN_DOC_SRCS = [ diff --git a/examples/ios/HelloWorld/BUILD b/examples/ios/HelloWorld/BUILD index 10edbf0b87..f0212a416e 100644 --- a/examples/ios/HelloWorld/BUILD +++ b/examples/ios/HelloWorld/BUILD @@ -1,10 +1,10 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") load("//apple:ios.bzl", "ios_application") -load("//apple:xcarchive.bzl", "xcarchive") load( "//apple:versioning.bzl", "apple_bundle_version", ) +load("//apple:xcarchive.bzl", "xcarchive") licenses(["notice"]) diff --git a/examples/ios/iMessageApp/BUILD b/examples/ios/iMessageApp/BUILD index 17df2fffc9..754c5e5d4c 100644 --- a/examples/ios/iMessageApp/BUILD +++ b/examples/ios/iMessageApp/BUILD @@ -1,4 +1,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:ios.bzl", "ios_imessage_application", @@ -8,10 +12,6 @@ load( "//apple:versioning.bzl", "apple_bundle_version", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"]) diff --git a/examples/macos/CommandLineSwift/BUILD b/examples/macos/CommandLineSwift/BUILD index 217287a9cc..523aeeb03d 100644 --- a/examples/macos/CommandLineSwift/BUILD +++ b/examples/macos/CommandLineSwift/BUILD @@ -1,4 +1,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:macos.bzl", "macos_command_line_application", @@ -7,10 +11,6 @@ load( "//apple:versioning.bzl", "apple_bundle_version", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"]) diff --git a/examples/macos/HelloWorldSwift/BUILD b/examples/macos/HelloWorldSwift/BUILD index 57788ee34f..b84da66cb3 100644 --- a/examples/macos/HelloWorldSwift/BUILD +++ b/examples/macos/HelloWorldSwift/BUILD @@ -1,4 +1,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:macos.bzl", "macos_application", @@ -7,10 +11,6 @@ load( "//apple:versioning.bzl", "apple_bundle_version", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"]) diff --git a/examples/macos/XPCServiceApp/BUILD b/examples/macos/XPCServiceApp/BUILD index 0e69c538d5..687a104033 100644 --- a/examples/macos/XPCServiceApp/BUILD +++ b/examples/macos/XPCServiceApp/BUILD @@ -1,4 +1,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:macos.bzl", "macos_application", @@ -8,10 +12,6 @@ load( "//apple:versioning.bzl", "apple_bundle_version", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"]) diff --git a/examples/multi_platform/Buttons/BUILD b/examples/multi_platform/Buttons/BUILD index 8a9a7433bf..e620609b7d 100644 --- a/examples/multi_platform/Buttons/BUILD +++ b/examples/multi_platform/Buttons/BUILD @@ -1,4 +1,8 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:ios.bzl", "ios_application", @@ -27,10 +31,6 @@ load( "watchos_application", "watchos_extension", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"]) diff --git a/examples/visionos/HelloWorld/BUILD b/examples/visionos/HelloWorld/BUILD index 9654b8b472..b557ba956c 100644 --- a/examples/visionos/HelloWorld/BUILD +++ b/examples/visionos/HelloWorld/BUILD @@ -3,8 +3,8 @@ load( "@build_bazel_rules_swift//swift:swift.bzl", "swift_library", ) -load("//apple:visionos.bzl", "visionos_application") load("//apple:versioning.bzl", "apple_bundle_version") +load("//apple:visionos.bzl", "visionos_application") licenses(["notice"]) diff --git a/test/BUILD b/test/BUILD index 549d06becf..6f51113a61 100644 --- a/test/BUILD +++ b/test/BUILD @@ -1,3 +1,4 @@ +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( "//test:configurations.bzl", "IOS_64BIT_SIMULATOR_FAT_DEVICE_CONFIGURATIONS", @@ -6,16 +7,15 @@ load( "TVOS_CONFIGURATIONS", "WATCHOS_CONFIGURATIONS", ) -load( - "//test/starlark_tests:common.bzl", - "common", -) load( "//test:test_rules.bzl", "apple_multi_shell_test", "apple_shell_test", ) -load("@bazel_skylib//:bzl_library.bzl", "bzl_library") +load( + "//test/starlark_tests:common.bzl", + "common", +) licenses(["notice"]) diff --git a/test/starlark_tests/BUILD b/test/starlark_tests/BUILD index 9c6e2f5cf9..c6cd6e2c40 100644 --- a/test/starlark_tests/BUILD +++ b/test/starlark_tests/BUILD @@ -11,15 +11,16 @@ load(":apple_static_xcframework_tests.bzl", "apple_static_xcframework_test_suite load(":apple_universal_binary_tests.bzl", "apple_universal_binary_test_suite") load(":apple_xcframework_import_tests.bzl", "apple_xcframework_import_test_suite") load(":apple_xcframework_tests.bzl", "apple_xcframework_test_suite") +load(":docc_tests.bzl", "docc_test_suite") load(":dtrace_compile_tests.bzl", "dtrace_compile_test_suite") load(":generate_dynamic_xcframework_tests.bzl", "generate_dynamic_xcframework_test_suite") load(":generate_import_framework_tests.bzl", "generate_import_framework_test_suite") load(":ios_app_clip_tests.bzl", "ios_app_clip_test_suite") load(":ios_application_resources_test.bzl", "ios_application_resources_test_suite") load(":ios_application_tests.bzl", "ios_application_test_suite") +load(":ios_dynamic_framework_tests.bzl", "ios_dynamic_framework_test_suite") load(":ios_extension_tests.bzl", "ios_extension_test_suite") load(":ios_framework_tests.bzl", "ios_framework_test_suite") -load(":ios_dynamic_framework_tests.bzl", "ios_dynamic_framework_test_suite") load(":ios_imessage_application_tests.bzl", "ios_imessage_application_test_suite") load(":ios_imessage_extension_tests.bzl", "ios_imessage_extension_test_suite") load(":ios_static_framework_tests.bzl", "ios_static_framework_test_suite") @@ -31,13 +32,13 @@ load(":macos_application_tests.bzl", "macos_application_test_suite") load(":macos_bundle_tests.bzl", "macos_bundle_test_suite") load(":macos_command_line_application_tests.bzl", "macos_command_line_application_test_suite") load(":macos_dylib_tests.bzl", "macos_dylib_test_suite") +load(":macos_dynamic_framework_tests.bzl", "macos_dynamic_framework_test_suite") load(":macos_extension_tests.bzl", "macos_extension_test_suite") +load(":macos_framework_tests.bzl", "macos_framework_test_suite") load(":macos_quick_look_plugin_tests.bzl", "macos_quick_look_plugin_test_suite") +load(":macos_static_framework_tests.bzl", "macos_static_framework_test_suite") load(":macos_ui_test_tests.bzl", "macos_ui_test_test_suite") load(":macos_unit_test_tests.bzl", "macos_unit_test_test_suite") -load(":macos_framework_tests.bzl", "macos_framework_test_suite") -load(":macos_dynamic_framework_tests.bzl", "macos_dynamic_framework_test_suite") -load(":macos_static_framework_tests.bzl", "macos_static_framework_test_suite") load(":tvos_application_swift_tests.bzl", "tvos_application_swift_test_suite") load(":tvos_application_tests.bzl", "tvos_application_test_suite") load(":tvos_dynamic_framework_tests.bzl", "tvos_dynamic_framework_test_suite") @@ -52,13 +53,12 @@ load(":watchos_application_tests.bzl", "watchos_application_test_suite") load(":watchos_dynamic_framework_tests.bzl", "watchos_dynamic_framework_test_suite") load(":watchos_extension_tests.bzl", "watchos_extension_test_suite") load(":watchos_framework_tests.bzl", "watchos_framework_test_suite") -load(":watchos_static_framework_tests.bzl", "watchos_static_framework_test_suite") load(":watchos_single_target_application_tests.bzl", "watchos_single_target_application_test_suite") load(":watchos_single_target_ui_test_tests.bzl", "watchos_single_target_ui_test_test_suite") +load(":watchos_static_framework_tests.bzl", "watchos_static_framework_test_suite") load(":watchos_ui_test_tests.bzl", "watchos_ui_test_test_suite") load(":watchos_unit_test_tests.bzl", "watchos_unit_test_test_suite") load(":xcarchive_tests.bzl", "xcarchive_test_suite") -load(":docc_tests.bzl", "docc_test_suite") licenses(["notice"]) diff --git a/test/starlark_tests/resources/BUILD b/test/starlark_tests/resources/BUILD index 16e5f9fae7..be9ed22edb 100644 --- a/test/starlark_tests/resources/BUILD +++ b/test/starlark_tests/resources/BUILD @@ -1,13 +1,13 @@ +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:resources.bzl", "apple_bundle_import", "apple_resource_bundle", "apple_resource_group", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) load( "//test/starlark_tests:common.bzl", "common", diff --git a/test/starlark_tests/resources/frameworks/BUILD b/test/starlark_tests/resources/frameworks/BUILD index b3687ed4aa..522433e656 100644 --- a/test/starlark_tests/resources/frameworks/BUILD +++ b/test/starlark_tests/resources/frameworks/BUILD @@ -1,5 +1,5 @@ -load("//test/starlark_tests:common.bzl", "common") load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") +load("//test/starlark_tests:common.bzl", "common") package( default_visibility = ["//test/starlark_tests:__subpackages__"], diff --git a/test/starlark_tests/targets_under_test/apple/BUILD b/test/starlark_tests/targets_under_test/apple/BUILD index b32a5ef42c..b472041f97 100644 --- a/test/starlark_tests/targets_under_test/apple/BUILD +++ b/test/starlark_tests/targets_under_test/apple/BUILD @@ -1,3 +1,8 @@ +load("@bazel_skylib//rules:write_file.bzl", "write_file") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:apple.bzl", "apple_dynamic_xcframework_import", @@ -6,19 +11,11 @@ load( "apple_universal_binary", "apple_xcframework", ) -load( - "//test/starlark_tests/rules:generate_xcframework.bzl", - "generate_dynamic_xcframework", - "generate_static_xcframework", -) +load("//apple:header_map.bzl", "header_map") load( "//apple:ios.bzl", "ios_application", ) -load( - "//apple:versioning.bzl", - "apple_bundle_version", -) load( "//apple:macos.bzl", "macos_bundle", @@ -31,19 +28,22 @@ load( "swift_apple_core_ml_library", ) load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", + "//apple:versioning.bzl", + "apple_bundle_version", ) load( "//test/starlark_tests:common.bzl", "common", ) +load( + "//test/starlark_tests/rules:generate_xcframework.bzl", + "generate_dynamic_xcframework", + "generate_static_xcframework", +) load( "//test/testdata/rules:dummy_test_runner.bzl", "dummy_test_runner", ) -load("@bazel_skylib//rules:write_file.bzl", "write_file") -load("//apple:header_map.bzl", "header_map") licenses(["notice"]) diff --git a/test/starlark_tests/targets_under_test/ios/BUILD b/test/starlark_tests/targets_under_test/ios/BUILD index 7b41bb9b62..0a18fdb46b 100644 --- a/test/starlark_tests/targets_under_test/ios/BUILD +++ b/test/starlark_tests/targets_under_test/ios/BUILD @@ -1,3 +1,8 @@ +load("@bazel_skylib//rules:write_file.bzl", "write_file") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) load( "//apple:apple.bzl", "apple_dynamic_framework_import", @@ -5,6 +10,10 @@ load( "apple_static_framework_import", "apple_static_xcframework_import", ) +load( + "//apple:docc.bzl", + "docc_archive", +) load( "//apple:ios.bzl", "ios_app_clip", @@ -23,26 +32,21 @@ load( "//apple:resources.bzl", "apple_resource_group", ) -load("//test/testdata/rules:substitution.bzl", "substitution") -load( - "//test/starlark_tests/rules:generate_framework.bzl", - "generate_import_framework", -) load( - "//test/starlark_tests/rules:generate_framework_dsym.bzl", - "generate_import_framework_dsym", + "//apple:xcarchive.bzl", + "xcarchive", ) load( "//test/starlark_tests:common.bzl", "common", ) load( - "//apple:docc.bzl", - "docc_archive", + "//test/starlark_tests/rules:generate_framework.bzl", + "generate_import_framework", ) load( - "//apple:xcarchive.bzl", - "xcarchive", + "//test/starlark_tests/rules:generate_framework_dsym.bzl", + "generate_import_framework_dsym", ) load( "//test/starlark_tests/rules:generate_xcframework.bzl", @@ -50,11 +54,7 @@ load( "generate_static_framework_xcframework", "generate_static_xcframework", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) -load("@bazel_skylib//rules:write_file.bzl", "write_file") +load("//test/testdata/rules:substitution.bzl", "substitution") licenses(["notice"]) diff --git a/test/starlark_tests/targets_under_test/macos/BUILD b/test/starlark_tests/targets_under_test/macos/BUILD index 4c93c02f60..57fc983adf 100644 --- a/test/starlark_tests/targets_under_test/macos/BUILD +++ b/test/starlark_tests/targets_under_test/macos/BUILD @@ -1,3 +1,13 @@ +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) +load( + "//apple:apple.bzl", + "apple_dynamic_framework_import", + "apple_dynamic_xcframework_import", + "apple_static_framework_import", +) load( "//apple:macos.bzl", "macos_application", @@ -17,16 +27,6 @@ load( "//apple:resources.bzl", "apple_resource_group", ) -load( - "//apple:apple.bzl", - "apple_dynamic_framework_import", - "apple_dynamic_xcframework_import", - "apple_static_framework_import", -) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) load( "//test/starlark_tests:common.bzl", "common", @@ -36,11 +36,11 @@ load( "generate_import_framework", ) load("//test/starlark_tests/rules:generate_framework_dsym.bzl", "generate_import_framework_dsym") -load("//test/testdata/rules:substitution.bzl", "substitution") load( "//test/starlark_tests/rules:generate_xcframework.bzl", "generate_dynamic_xcframework", ) +load("//test/testdata/rules:substitution.bzl", "substitution") licenses(["notice"]) diff --git a/test/starlark_tests/targets_under_test/tvos/BUILD b/test/starlark_tests/targets_under_test/tvos/BUILD index 0ddd0fc104..b68370969c 100644 --- a/test/starlark_tests/targets_under_test/tvos/BUILD +++ b/test/starlark_tests/targets_under_test/tvos/BUILD @@ -1,3 +1,15 @@ +load("@bazel_skylib//rules:write_file.bzl", "write_file") +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) +load( + "//apple:apple.bzl", + "apple_dynamic_framework_import", + "apple_dynamic_xcframework_import", + "apple_static_framework_import", + "apple_static_xcframework_import", +) load( "//apple:tvos.bzl", "tvos_application", @@ -8,13 +20,6 @@ load( "tvos_ui_test", "tvos_unit_test", ) -load( - "//apple:apple.bzl", - "apple_dynamic_framework_import", - "apple_dynamic_xcframework_import", - "apple_static_framework_import", - "apple_static_xcframework_import", -) load( "//test/starlark_tests:common.bzl", "common", @@ -28,11 +33,6 @@ load( "generate_dynamic_xcframework", "generate_static_xcframework", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) -load("@bazel_skylib//rules:write_file.bzl", "write_file") licenses(["notice"]) diff --git a/test/starlark_tests/targets_under_test/watchos/BUILD b/test/starlark_tests/targets_under_test/watchos/BUILD index 829d3607e6..ae6fd66ee2 100644 --- a/test/starlark_tests/targets_under_test/watchos/BUILD +++ b/test/starlark_tests/targets_under_test/watchos/BUILD @@ -1,3 +1,14 @@ +load( + "@build_bazel_rules_swift//swift:swift.bzl", + "swift_library", +) +load( + "//apple:apple.bzl", + "apple_dynamic_framework_import", + "apple_dynamic_xcframework_import", + "apple_static_framework_import", + "apple_static_xcframework_import", +) load( "//apple:ios.bzl", "ios_application", @@ -12,13 +23,6 @@ load( "watchos_ui_test", "watchos_unit_test", ) -load( - "//apple:apple.bzl", - "apple_dynamic_framework_import", - "apple_dynamic_xcframework_import", - "apple_static_framework_import", - "apple_static_xcframework_import", -) load( "//test/starlark_tests:common.bzl", "common", @@ -32,10 +36,6 @@ load( "generate_dynamic_xcframework", "generate_static_xcframework", ) -load( - "@build_bazel_rules_swift//swift:swift.bzl", - "swift_library", -) licenses(["notice"])