Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update buildifier #252

Merged
merged 1 commit into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/keith/pre-commit-buildifier
rev: 6.0.0
rev: 6.3.3
hooks:
- id: buildifier
- id: buildifier-lint
2 changes: 1 addition & 1 deletion crosstool/cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
"""A C++ toolchain configuration rule for macOS."""

load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
load(
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
"action_config",
Expand All @@ -29,7 +30,6 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")

# TODO: Remove when we drop bazel 6.x support
_OBJC_ARCHIVE_ACTION_NAME = "objc-archive"
Expand Down
2 changes: 1 addition & 1 deletion crosstool/osx_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.
"""Configuring the C++ toolchain on macOS."""

load("@bazel_tools//tools/osx:xcode_configure.bzl", "run_xcode_locator")
load(
"@bazel_tools//tools/cpp:lib_cc_configure.bzl",
"escape_string",
)
load("@bazel_tools//tools/osx:xcode_configure.bzl", "run_xcode_locator")

def _get_escaped_xcode_cxx_inc_directories(repository_ctx, xcode_toolchains):
"""Compute the list of default C++ include paths on Xcode-enabled darwin.
Expand Down
2 changes: 1 addition & 1 deletion lib/lipo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

"""APIs for operating on universal binaries with `lipo`."""

load(":apple_support.bzl", "apple_support")
load(
"@bazel_skylib//lib:shell.bzl",
"shell",
)
load(":apple_support.bzl", "apple_support")

def _create(
*,
Expand Down
2 changes: 1 addition & 1 deletion rules/private/apple_genrule.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

"""Genrule which provides Apple's Xcode environment."""

load("//lib:apple_support.bzl", "apple_support")
load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("//lib:apple_support.bzl", "apple_support")

def _compute_make_variables(
genfiles_dir,
Expand Down
2 changes: 1 addition & 1 deletion rules/rules.doc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Helper rules for Apple platforms
"""

load("//rules/private:apple_genrule.bzl", _apple_genrule = "apple_genrule")
load("//rules:toolchain_substitution.bzl", _toolchain_substitution = "toolchain_substitution")
load("//rules:universal_binary.bzl", _universal_binary = "universal_binary")
load("//rules/private:apple_genrule.bzl", _apple_genrule = "apple_genrule")

apple_genrule = _apple_genrule
toolchain_substitution = _toolchain_substitution
Expand Down
2 changes: 1 addition & 1 deletion rules/universal_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

"""Implementation for macOS universal binary rule."""

load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("//lib:apple_support.bzl", "apple_support")
load("//lib:lipo.bzl", "lipo")
load("//lib:transitions.bzl", "macos_universal_transition")
load("@bazel_skylib//lib:dicts.bzl", "dicts")

def _universal_binary_impl(ctx):
inputs = [
Expand Down
8 changes: 4 additions & 4 deletions test/BUILD
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
load("//rules:apple_genrule.bzl", "apple_genrule")
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("//rules:apple_genrule.bzl", "apple_genrule")
load(":apple_support_test.bzl", "apple_support_test")
load(":universal_binary_test.bzl", "universal_binary_test")
load(":xcode_support_test.bzl", "xcode_support_test")
load(":starlark_apple_binary.bzl", "starlark_apple_binary")
load(":binary_tests.bzl", "binary_test_suite")
load(":linking_tests.bzl", "linking_test_suite")
load(":starlark_apple_binary.bzl", "starlark_apple_binary")
load(":universal_binary_test.bzl", "universal_binary_test")
load(":xcode_support_test.bzl", "xcode_support_test")

licenses(["notice"])

Expand Down