Update and fix for rules_apple 3.5.0 (#864)

Author: luispadron

MODULE.bazel

@@ -21,12 +21,12 @@ module(
 # Declare the bzlmod dependencies needed by rules_ios and users of rules_ios
 bazel_dep(
     name = "apple_support",
-    version = "1.11.1",
+    version = "1.15.1",
     repo_name = "build_bazel_apple_support",
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.1.1",
+    version = "3.5.0",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
@@ -35,7 +35,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_swift",
-    version = "1.13.0",
+    version = "1.18.0",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(

README.md

@@ -43,7 +43,8 @@ See the following table for supported rules_apple release versions.
 
 | rules_apple release | Minimum supported rules version | Final supported rules version
 |:-------------------:|:-------------------------:|:-------------------------:
-| 3.* | 3.* | current
+| 3.5.* | 4.3.0 | current
+| 3.* | 3.* | 4.2.1
 | 2.* | 2.* | 3.2.2
 | 1.* | 1.0.0 | 3.2.2
 

rules/framework.bzl

@@ -617,7 +617,7 @@ def _merge_root_infoplists(ctx):
         output_pkginfo = None,
         output_discriminator = "framework",
         platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type, features),
-        resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
+        plisttool = apple_mac_toolchain_info.plisttool,
         rule_descriptor = rule_descriptor,
         rule_label = ctx.label,
         version = None,
@@ -816,7 +816,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
             linkmaps = debug_outputs.linkmaps,
             dsym_info_plist_template = apple_mac_toolchain_info.dsym_info_plist_template,
             platform_prerequisites = platform_prerequisites,
-            resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
+            plisttool = apple_mac_toolchain_info.plisttool,
             rule_label = label,
             version = None,
         ),

rules/precompiled_apple_resource_bundle.bzl

@@ -113,7 +113,7 @@ def _precompiled_apple_resource_bundle_impl(ctx):
         output_pkginfo = None,
         output_plist = output_plist,
         output_discriminator = "bundle",
-        resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool,
+        plisttool = apple_mac_toolchain_info.plisttool,
         **partials_args
     )
 
@@ -180,19 +180,16 @@ def _precompiled_apple_resource_bundle_impl(ctx):
         output = bundletool_instructions_file,
         content = bundletool_instructions.to_json(),
     )
-    resolved_bundletool_experimental = apple_mac_toolchain_info.resolved_bundletool_experimental
+    bundletool_experimental = apple_mac_toolchain_info.bundletool_experimental
 
     apple_support.run(
         actions = ctx.actions,
         apple_fragment = platform_prerequisites.apple_fragment,
-        executable = resolved_bundletool_experimental.executable,
+        executable = bundletool_experimental,
         execution_requirements = {},
-        inputs = depset(resolved_bundletool_experimental.inputs.to_list() + input_files + [bundletool_instructions_file], transitive = [
-            resolved_bundletool_experimental.inputs,
-        ]),
-        input_manifests = resolved_bundletool_experimental.input_manifests,
+        inputs = depset(input_files + [bundletool_instructions_file]),
         mnemonic = "BundleResources",
-        tools = [apple_mac_toolchain_info.resolved_bundletool_experimental.executable],
+        tools = [apple_mac_toolchain_info.bundletool_experimental.executable],
         xcode_config = platform_prerequisites.xcode_version_config,
         arguments = [bundletool_instructions_file.path],
         outputs = [output_bundle_dir],

rules/repositories.bzl

@@ -88,15 +88,15 @@ def _rules_ios_bzlmod_dependencies():
     _maybe(
         http_archive,
         name = "build_bazel_rules_swift",
-        sha256 = "28a66ff5d97500f0304f4e8945d936fe0584e0d5b7a6f83258298007a93190ba",
-        url = "https://github.com/bazelbuild/rules_swift/releases/download/1.13.0/rules_swift.1.13.0.tar.gz",
+        sha256 = "bb01097c7c7a1407f8ad49a1a0b1960655cf823c26ad2782d0b7d15b323838e2",
+        url = "https://github.com/bazelbuild/rules_swift/releases/download/1.18.0/rules_swift.1.18.0.tar.gz",
     )
 
     _maybe(
         http_archive,
         name = "build_bazel_rules_apple",
-        sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
-        url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
+        sha256 = "c5387f966966000ab65284d4535d956491e7d31ed92ec79731c52e8fd4a49d5e",
+        url = "https://github.com/bazelbuild/rules_apple/releases/download/3.5.0/rules_apple.3.5.0.tar.gz",
     )
     _maybe(
         http_archive,