Skip to content

Commit 5819bb5

Browse files
committed
Support bazel 9
1 parent 79f26ec commit 5819bb5

11 files changed

Lines changed: 21 additions & 3 deletions

File tree

MODULE.bazel

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,22 @@ bazel_dep(name = "bazel_features", version = "1.3.0")
1010
bazel_dep(name = "bazel_skylib", version = "1.3.0")
1111
bazel_dep(
1212
name = "rules_swift",
13-
version = "3.1.1",
13+
version = "3.4.2",
1414
repo_name = "build_bazel_rules_swift",
1515
)
1616
bazel_dep(
1717
name = "rules_apple",
18-
version = "4.0.1",
18+
version = "4.3.3",
1919
repo_name = "build_bazel_rules_apple",
2020
)
21-
bazel_dep(name = "rules_python", version = "0.27.1")
21+
git_override(
22+
module_name = "rules_apple",
23+
remote = "https://github.com/bazelbuild/rules_apple",
24+
commit = "d930c4c6eaeed91c8275604a428407d123a85216",
25+
)
26+
27+
bazel_dep(name = "rules_python", version = "1.8.1")
28+
bazel_dep(name = "rules_cc", version = "0.2.17")
2229

2330
internal = use_extension("//xcodeproj:extensions.bzl", "internal")
2431
use_repo(internal, "rules_xcodeproj_generated")

examples/integration/iOSApp/Source/CoreUtilsMixed/MixedAnswer/module_map.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
""" Allows for the creation of modulemaps given a list of headers """
22

33
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
4+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
5+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
46

57
HEADERS_FILE_TYPES = [
68
".h",

xcodeproj/automatic_target_info.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ load(
66
"AppleFrameworkImportInfo",
77
"AppleResourceBundleInfo",
88
)
9+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
910
load("//xcodeproj:xcodeprojinfo.bzl", "target_type")
1011
load("//xcodeproj/internal:memory_efficiency.bzl", "EMPTY_LIST", "NONE_LIST")
1112

xcodeproj/internal/compilation_providers.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""Module for propagating compilation providers."""
22

33
load("@bazel_features//:features.bzl", "bazel_features")
4+
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
45
load(
56
":memory_efficiency.bzl",
67
"EMPTY_DEPSET",

xcodeproj/internal/execution_root.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def write_execution_root_file(*, actions, bin_dir_path, name):
1919
output = actions.declare_file("{}_execution_root_file".format(name))
2020

2121
actions.run_shell(
22+
use_default_shell_env = True,
2223
outputs = [output],
2324
command = """\
2425
bin_dir_full="$(perl -MCwd -e 'print Cwd::abs_path shift' "{bin_dir}";)"

xcodeproj/internal/processed_targets/library_targets.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
44
load("@build_bazel_rules_apple//apple:providers.bzl", "AppleDebugOutputsInfo")
55
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "SwiftProtoInfo")
6+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
67
load("//xcodeproj/internal:build_settings.bzl", "get_product_module_name")
78
load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")
89
load("//xcodeproj/internal:compiler_args.bzl", "compiler_args")

xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
44
load("@build_bazel_rules_apple//apple:providers.bzl", "AppleDebugOutputsInfo")
55
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
6+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
67
load("//xcodeproj:xcodeprojinfo.bzl", "XcodeProjInfo")
78
load("//xcodeproj/internal:build_settings.bzl", "get_product_module_name")
89
load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")

xcodeproj/internal/processed_targets/top_level_targets.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ load(
1010
"AppleResourceInfo",
1111
)
1212
load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "SwiftProtoInfo")
13+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
1314
load("//xcodeproj:xcodeprojinfo.bzl", "XcodeProjInfo")
1415
load(
1516
"//xcodeproj/internal:build_settings.bzl",

xcodeproj/internal/processed_targets/unsupported_targets.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load(
44
"@build_bazel_rules_apple//apple:providers.bzl",
55
"AppleResourceBundleInfo",
66
)
7+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
78
load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")
89
load("//xcodeproj/internal:configuration.bzl", "calculate_configuration")
910
load("//xcodeproj/internal:dependencies.bzl", "dependencies")

xcodeproj/internal/products.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""Module for collecting product information for a target."""
22

33
load("@bazel_skylib//lib:paths.bzl", "paths")
4+
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
45
load("//xcodeproj/internal/files:files.bzl", "join_paths_ignoring_empty")
56
load("//xcodeproj/internal/files:linker_input_files.bzl", "linker_input_files")
67

0 commit comments

Comments
 (0)