Skip to content

Commit d579da2

Browse files
authored
Update and fix for rules_apple 3.5.0 (#864)
1 parent 5182a71 commit d579da2

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ module(
2121
# Declare the bzlmod dependencies needed by rules_ios and users of rules_ios
2222
bazel_dep(
2323
name = "apple_support",
24-
version = "1.11.1",
24+
version = "1.15.1",
2525
repo_name = "build_bazel_apple_support",
2626
)
2727
bazel_dep(
2828
name = "rules_apple",
29-
version = "3.1.1",
29+
version = "3.5.0",
3030
repo_name = "build_bazel_rules_apple",
3131
)
3232
bazel_dep(
@@ -35,7 +35,7 @@ bazel_dep(
3535
)
3636
bazel_dep(
3737
name = "rules_swift",
38-
version = "1.13.0",
38+
version = "1.18.0",
3939
repo_name = "build_bazel_rules_swift",
4040
)
4141
bazel_dep(

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ See the following table for supported rules_apple release versions.
4343

4444
| rules_apple release | Minimum supported rules version | Final supported rules version
4545
|:-------------------:|:-------------------------:|:-------------------------:
46-
| 3.* | 3.* | current
46+
| 3.5.* | 4.3.0 | current
47+
| 3.* | 3.* | 4.2.1
4748
| 2.* | 2.* | 3.2.2
4849
| 1.* | 1.0.0 | 3.2.2
4950

rules/framework.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ def _merge_root_infoplists(ctx):
617617
output_pkginfo = None,
618618
output_discriminator = "framework",
619619
platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type, features),
620-
resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
620+
plisttool = apple_mac_toolchain_info.plisttool,
621621
rule_descriptor = rule_descriptor,
622622
rule_label = ctx.label,
623623
version = None,
@@ -816,7 +816,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
816816
linkmaps = debug_outputs.linkmaps,
817817
dsym_info_plist_template = apple_mac_toolchain_info.dsym_info_plist_template,
818818
platform_prerequisites = platform_prerequisites,
819-
resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
819+
plisttool = apple_mac_toolchain_info.plisttool,
820820
rule_label = label,
821821
version = None,
822822
),

rules/precompiled_apple_resource_bundle.bzl

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def _precompiled_apple_resource_bundle_impl(ctx):
113113
output_pkginfo = None,
114114
output_plist = output_plist,
115115
output_discriminator = "bundle",
116-
resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
116+
plisttool = apple_mac_toolchain_info.plisttool,
117117
**partials_args
118118
)
119119

@@ -180,19 +180,16 @@ def _precompiled_apple_resource_bundle_impl(ctx):
180180
output = bundletool_instructions_file,
181181
content = bundletool_instructions.to_json(),
182182
)
183-
resolved_bundletool_experimental = apple_mac_toolchain_info.resolved_bundletool_experimental
183+
bundletool_experimental = apple_mac_toolchain_info.bundletool_experimental
184184

185185
apple_support.run(
186186
actions = ctx.actions,
187187
apple_fragment = platform_prerequisites.apple_fragment,
188-
executable = resolved_bundletool_experimental.executable,
188+
executable = bundletool_experimental,
189189
execution_requirements = {},
190-
inputs = depset(resolved_bundletool_experimental.inputs.to_list() + input_files + [bundletool_instructions_file], transitive = [
191-
resolved_bundletool_experimental.inputs,
192-
]),
193-
input_manifests = resolved_bundletool_experimental.input_manifests,
190+
inputs = depset(input_files + [bundletool_instructions_file]),
194191
mnemonic = "BundleResources",
195-
tools = [apple_mac_toolchain_info.resolved_bundletool_experimental.executable],
192+
tools = [apple_mac_toolchain_info.bundletool_experimental.executable],
196193
xcode_config = platform_prerequisites.xcode_version_config,
197194
arguments = [bundletool_instructions_file.path],
198195
outputs = [output_bundle_dir],

rules/repositories.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ def _rules_ios_bzlmod_dependencies():
8888
_maybe(
8989
http_archive,
9090
name = "build_bazel_rules_swift",
91-
sha256 = "28a66ff5d97500f0304f4e8945d936fe0584e0d5b7a6f83258298007a93190ba",
92-
url = "https://github.com/bazelbuild/rules_swift/releases/download/1.13.0/rules_swift.1.13.0.tar.gz",
91+
sha256 = "bb01097c7c7a1407f8ad49a1a0b1960655cf823c26ad2782d0b7d15b323838e2",
92+
url = "https://github.com/bazelbuild/rules_swift/releases/download/1.18.0/rules_swift.1.18.0.tar.gz",
9393
)
9494

9595
_maybe(
9696
http_archive,
9797
name = "build_bazel_rules_apple",
98-
sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
99-
url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
98+
sha256 = "c5387f966966000ab65284d4535d956491e7d31ed92ec79731c52e8fd4a49d5e",
99+
url = "https://github.com/bazelbuild/rules_apple/releases/download/3.5.0/rules_apple.3.5.0.tar.gz",
100100
)
101101
_maybe(
102102
http_archive,

0 commit comments

Comments
 (0)