From 98bf4ab6bf4dc88ac42fa8fb84a4fccfc2b92178 Mon Sep 17 00:00:00 2001
From: Matt Robinson <matt.robinson@reddit.com>
Date: Fri, 23 Dec 2022 09:09:41 -0600
Subject: [PATCH] Update `rules_apple` to `2.0.0`

Update `rules_apple` to https://github.com/bazelbuild/rules_apple/releases/tag/2.0.0:

- Handle https://github.com/bazelbuild/rules_apple/commit/c23720d831587b7f72c2245ebafaf0124a2240bc by adding `cc_info` param to `framework_provider_partial` call.
- Handle https://github.com/bazelbuild/rules_apple/commit/51d6273a11d25f3fd9e086e131f1e93167e00360 by removing `bin_root_path`/`rule_label` param to `debug_symbols_partial` call.
- Handle https://github.com/bazelbuild/rules_apple/commit/a4de2228f1432ccf651a91370b145f26ad441abd by removing the `apple_xcframework.framework_type` param.
---
 rules/framework.bzl                      | 3 +--
 rules/repositories.bzl                   | 4 ++--
 tests/ios/frameworks/dynamic/BUILD.bazel | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/framework.bzl b/rules/framework.bzl
index 8b0c21f69..ac49f0731 100644
--- a/rules/framework.bzl
+++ b/rules/framework.bzl
@@ -691,7 +691,6 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
         ),
         partials.debug_symbols_partial(
             actions = actions,
-            bin_root_path = bin_root_path,
             bundle_extension = bundle_extension,
             bundle_name = bundle_name,
             debug_dependencies = dep_frameworks,
@@ -700,7 +699,6 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
             dsym_info_plist_template = apple_mac_toolchain_info.dsym_info_plist_template,
             executable_name = executable_name,
             platform_prerequisites = platform_prerequisites,
-            rule_label = label,
         ),
         partials.embedded_bundles_partial(
             frameworks = [archive_for_embedding],
@@ -722,6 +720,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
             binary_artifact = binary_artifact,
             bundle_name = bundle_name,
             bundle_only = False,
+            cc_info = link_result.cc_info,
             objc_provider = link_result.objc,
             rule_label = label,
         ),
diff --git a/rules/repositories.bzl b/rules/repositories.bzl
index 528413220..90b1df050 100644
--- a/rules/repositories.bzl
+++ b/rules/repositories.bzl
@@ -62,10 +62,10 @@ def rules_ios_dependencies():
     _maybe(
         github_repo,
         name = "build_bazel_rules_apple",
-        ref = "f99c3cb7e472ecd68b81ea8dab97609a4b75db06",
+        ref = "c628b0e4b3261b4627bcd4e9f91e75b4e5eb0e1a",
         project = "bazelbuild",
         repo = "rules_apple",
-        sha256 = "5e82a98a591efda772a5ee96ed17bcad38338aafeba6055daab04a5d6c13ea50",
+        sha256 = "495ffc13769b81e401d108a47925885c43f9dfccfbb229d4418d509c6cea14be",
     )
 
     _maybe(
diff --git a/tests/ios/frameworks/dynamic/BUILD.bazel b/tests/ios/frameworks/dynamic/BUILD.bazel
index 298154169..5c30ea9c9 100644
--- a/tests/ios/frameworks/dynamic/BUILD.bazel
+++ b/tests/ios/frameworks/dynamic/BUILD.bazel
@@ -35,7 +35,6 @@ apple_xcframework(
     name = "iOSSwiftXCFramework",
     bundle_id = "com.google.example",
     bundle_name = "c",
-    framework_type = ["dynamic"],
     infoplists = [
         "Info.plist",
     ],