Skip to content

Commit

Permalink
Sort load statements per buildifier 6.4.0 (#2499)
Browse files Browse the repository at this point in the history
Followup request from #2485 

rules_apple is on buildifier 6.3.2, one version before load sorting
improvements. Can update that too.
  • Loading branch information
erikkerber committed Jul 12, 2024
1 parent c8a6f61 commit 6db5fb0
Show file tree
Hide file tree
Showing 20 changed files with 109 additions and 109 deletions.
2 changes: 1 addition & 1 deletion apple/build_settings/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 5 additions & 5 deletions apple/internal/BUILD
Original file line number Diff line number Diff line change
@@ -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"])
Expand Down
2 changes: 1 addition & 1 deletion apple/testing/default_runner/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load(
"//apple/testing/default_runner:ios_test_runner.bzl",
"ios_test_runner",
Expand All @@ -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"])

Expand Down
2 changes: 1 addition & 1 deletion doc/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion examples/ios/HelloWorld/BUILD
Original file line number Diff line number Diff line change
@@ -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"])

Expand Down
8 changes: 4 additions & 4 deletions examples/ios/iMessageApp/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -8,10 +12,6 @@ load(
"//apple:versioning.bzl",
"apple_bundle_version",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

licenses(["notice"])

Expand Down
8 changes: 4 additions & 4 deletions examples/macos/CommandLineSwift/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -7,10 +11,6 @@ load(
"//apple:versioning.bzl",
"apple_bundle_version",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

licenses(["notice"])

Expand Down
8 changes: 4 additions & 4 deletions examples/macos/HelloWorldSwift/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -7,10 +11,6 @@ load(
"//apple:versioning.bzl",
"apple_bundle_version",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

licenses(["notice"])

Expand Down
8 changes: 4 additions & 4 deletions examples/macos/XPCServiceApp/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -8,10 +12,6 @@ load(
"//apple:versioning.bzl",
"apple_bundle_version",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

licenses(["notice"])

Expand Down
8 changes: 4 additions & 4 deletions examples/multi_platform/Buttons/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -27,10 +31,6 @@ load(
"watchos_application",
"watchos_extension",
)
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

licenses(["notice"])

Expand Down
2 changes: 1 addition & 1 deletion examples/visionos/HelloWorld/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"])

Expand Down
10 changes: 5 additions & 5 deletions test/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load(
"//test:configurations.bzl",
"IOS_64BIT_SIMULATOR_FAT_DEVICE_CONFIGURATIONS",
Expand All @@ -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"])

Expand Down
12 changes: 6 additions & 6 deletions test/starlark_tests/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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"])

Expand Down
8 changes: 4 additions & 4 deletions test/starlark_tests/resources/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/starlark_tests/resources/frameworks/BUILD
Original file line number Diff line number Diff line change
@@ -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__"],
Expand Down
26 changes: 13 additions & 13 deletions test/starlark_tests/targets_under_test/apple/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -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"])

Expand Down
32 changes: 16 additions & 16 deletions test/starlark_tests/targets_under_test/ios/BUILD
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
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:docc.bzl",
"docc_archive",
)
load(
"//apple:ios.bzl",
"ios_app_clip",
Expand All @@ -23,38 +32,29 @@ 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",
"generate_dynamic_xcframework",
"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"])

Expand Down
Loading

0 comments on commit 6db5fb0

Please sign in to comment.