ann-flavor-cocoapods 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c819f56bb3a959737651233fbdbed8e0bd887ddcdfbf0fd0c157c26b99a011
-  data.tar.gz: d322f020327b3b62f3eb02922a01d1af90040a2b5595614a37795eacf311a2cf
+  metadata.gz: 0753376f0ddae76a1894acb795e3e1cac3f6a975a79b799e0cccc79c9db2760b
+  data.tar.gz: cc9c6297e39a2702dc119975168fc92926eb2db5bdfc9c23ff44eb9076b8b568
 SHA512:
-  metadata.gz: 85564c5fcc276b9f448381fc8cb3d334ca65d9bedbccd2b40fe25b46e43775afc50f66b7a2c6394ab032a118ecb8e3b1335b596c89f0c5dc79d7945bc52bc7ac
-  data.tar.gz: e2e76a0da4568f8bc5a040d1f3f0422a8844b1da28b0b34b6324fda2c56d7c47eceec963ae644c82044f266b20193fe29d9572cce60a7dbf59933ac8df9a2221
+  metadata.gz: 2b56c73fc8ced1dbd22e58e2780aded019fc5cf87e76ed6df5fac6ec6ab4650f4391e3707543147095df39b1342fa892a9c6699604cad1ce75daec906b7a37cb
+  data.tar.gz: 2c1dcff237aded83a87e68fe1b1d4869bd901d61c5703749307df2dd02ba91105fefdc62363fcc5d7b2dbb095bb09d491d5410b64456eced522e82a2255b9322

data/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## 0.4.6
+
+### Changed
+- **Info.plist and entitlements merging moved from a build-time
+  `PBXShellScriptBuildPhase` to plain Ruby code that runs during
+  CocoaPods' `post_integrate` hook (pod-install time).** 0.4.1-0.4.5
+  each narrowed the conditions under which the "Cycle inside Runner"
+  failure occurred, but deep research (Apple Developer Forums,
+  CocoaPods/CocoaPods#11133, several flutter/flutter issues, and the
+  `swift-build` source) confirmed the real cause: *any*
+  `PBXShellScriptBuildPhase` with declared `output_paths` feeding
+  `INFOPLIST_FILE`/`CODE_SIGN_ENTITLEMENTS` becomes a graph node XCBuild
+  must order relative to a shared `ModuleVerifierTaskProducer` gate that
+  framework-embed phases (CocoaPods and SPM alike) are also gated
+  behind — no `build_phases` position or `input_paths` declaration could
+  avoid it. The values these phases merged (flavor name, files already on
+  disk) are fully known at `pod install` time, so there is no need for a
+  build-time script phase at all — the same pattern CocoaPods' own
+  `Pods-Runner-Info.plist` already uses.
+- `[ann-flavor] Merge Info.plist` and `[ann-flavor] Merge Entitlements`
+  build phases are no longer injected, at all, for any project (new or
+  upgrading from 0.4.1-0.4.5's phases, which are removed).
+- Merged output is now written directly to
+  `ios/ann/Info/merged/<flavor>-<buildType>.plist` and
+  `ios/ann/Entitlements/merged/<flavor>-<buildType>.entitlements` — one
+  file per flavor **and build type** (previously one merged file per
+  flavor, always built from the `release`-level cascade regardless of
+  build type — see the matching `ann-flavor-flutter` 1.6.0 changelog
+  entry for the generator-side half of this fix).
+- `INFOPLIST_FILE`/`CODE_SIGN_ENTITLEMENTS` build settings now point
+  directly at these per-build-type merged files under `$(SRCROOT)`,
+  instead of a `$(DERIVED_FILE_DIR)/...-merged...` path produced by a
+  script phase.
+
+### Fixed
+- A stale merged entitlements file is now deleted when a flavor/build-type
+  combination that previously had entitlements to sign no longer does
+  (previously only the build setting was cleared; the stale file was left
+  on disk).
+
+## 0.4.5
+
+### Fixed
+- **0.4.4 stopped the cycle for a *fresh* install, but any project already
+  on 0.4.1-0.4.3 kept hitting it after upgrading.** 0.4.4 stopped *setting*
+  `input_paths` on `[ann-flavor] Merge Entitlements`/`Merge Info.plist`, but
+  never explicitly *cleared* it. `existing = target.build_phases.find { ... }`
+  reuses the same Xcodeproj object across runs, and `pod install` never
+  touches an attribute it doesn't assign — so a project that had already run
+  0.4.1-0.4.3 (which did set `input_paths` on that same, reused object) kept
+  the stale value forever, silently reintroducing the exact "Cycle inside
+  Runner" failure 0.4.4 was meant to remove. Confirmed live against `ledger`:
+  the cycle came back, now involving whichever framework happened to be on
+  the other side of the shared `ModuleVerifierTaskProducer` gate (in this
+  case an SPM-resolved `AppLovinAdapter.xcframework`, following the
+  consumer's separate SPM plugin migration — same underlying mechanism, not
+  a new bug). Fixed by explicitly setting `phase.input_paths = []` on both
+  phases, so a stale value is genuinely wiped on the next `pod install`, not
+  just left unset going forward.
+
 ## 0.4.4
 
 ### Fixed

data/lib/ann_flavor_cocoapods/podfile_helper.rb

@@ -2,9 +2,14 @@ require_relative 'spec_loader'
 require 'ann_flavor_core'
 require 'xcodeproj'
 require 'stringio'
+require 'json'
+require 'fileutils'
 
 module AnnFlavorCocoapods
   module PodfileHelper
+    # System `plutil` tool -- used to read plist files as JSON (see
+    # read_plist below); ships with Xcode/macOS.
+    PLUTIL = '/usr/bin/plutil'
     # Call inside your Podfile's post_integrate hook to wire per-flavor Firebase
     # GoogleService-Info.plist into the Xcode build. Must be post_integrate, not
     # post_install (DEF-061, #61): post_install fires before CocoaPods has
@@ -155,7 +160,6 @@ module AnnFlavorCocoapods
         user_project.native_targets.each do |target|
           if target.symbol_type == :application
             find_or_create_icon_catalog(target, user_project)
-            target_has_entitlements = false
 
             ios.flavors.each_key do |flavor_key|
               flavor = ios.flavors[flavor_key]
@@ -179,29 +183,21 @@ module AnnFlavorCocoapods
 
                 assert_icon_generated!(user_project, flavor_key, icon_name)
 
-                # Extended opt-in check (plan 039): CODE_SIGN_ENTITLEMENTS is
-                # wired only when there is something to sign with at all --
-                # either this flavor's entitlements: cascade, or a stock
-                # Runner.entitlements to fall back to. Mirrors
-                # ios_generator.dart's _anyFlavorHasEntitlements OR-condition,
-                # but evaluated here instead of at sync time -- the actual
-                # merge now happens at this (pod install / build time) layer,
-                # not sync time, so this is where "is there anything to sign
-                # with" needs to be answered from. The Merge Entitlements
-                # phase itself is injected once per target below (like Merge
-                # Info.plist), not per flavor/build-type here -- it derives
-                # $FLAVOR_NAME from $CONFIGURATION at build time, so one
-                # shared phase correctly serves every flavor, whether or not
-                # that specific flavor has its own entitlements: cascade.
-                flavor_entitlements_file = File.join(user_project.project_dir.to_s, 'ann', 'Entitlements', "#{flavor_key}.entitlements")
-                stock_entitlements_file = File.join(user_project.project_dir.to_s, 'Runner', 'Runner.entitlements')
-                has_entitlements = File.exist?(flavor_entitlements_file) || File.exist?(stock_entitlements_file)
-                entitlements_path = has_entitlements ? '$(DERIVED_FILE_DIR)/Entitlements-merged.entitlements' : nil
-                target_has_entitlements ||= has_entitlements
+                # Resolved per build type -- info_plist:/entitlements: are
+                # both valid at build_types.<bt> level (REQ-FLVR-00110/
+                # REQ-FLVR-00120), so each (flavor, build type) pair needs
+                # its own merge, not one shared per flavor. Writes
+                # ann/Info/merged/<flavor>-<bt>.plist and (when there's
+                # anything to sign with) ann/Entitlements/merged/<flavor>-<bt>
+                # .entitlements to disk now, at pod-install time -- see
+                # merge_info_plist's doc comment for why this moved off a
+                # build-time script phase.
+                info_plist_path = merge_info_plist(user_project.project_dir.to_s, flavor_key, bt)
+                entitlements_path = merge_entitlements(user_project.project_dir.to_s, flavor_key, bt)
 
                 configure_build_configuration(
                   target, user_project, xcode_config, xcconfig_path,
-                  icon_name, entitlements_path
+                  icon_name, entitlements_path, info_plist_path
                 )
               end
 
@@ -211,19 +207,6 @@ module AnnFlavorCocoapods
             if print_build_info
               inject_build_info_phase(target)
             end
-
-            inject_merge_info_plist_phase(target)
-
-            # Unlike Merge Info.plist (unconditional -- every flavor always
-            # has an Info.plist), Merge Entitlements is only injected when at
-            # least one flavor actually needs it (its own cascade, or a
-            # stock Runner.entitlements) -- entitlements are opt-in overall,
-            # and a phase with nothing to sign would just be dead weight.
-            if target_has_entitlements
-              inject_merge_entitlements_phase(target)
-            else
-              remove_merge_entitlements_phase(target)
-            end
           end
 
           # Fixes a real pod-install failure: PBXNativeTarget#resolved_build_setting
@@ -620,7 +603,7 @@ module AnnFlavorCocoapods
       CODE_SIGN_ENTITLEMENTS
     ].freeze
 
-    def self.configure_build_configuration(target, user_project, xcode_config, xcconfig_path, icon_name, entitlements_path = nil)
+    def self.configure_build_configuration(target, user_project, xcode_config, xcconfig_path, icon_name, entitlements_path = nil, info_plist_path = nil)
       config_list = target.build_configuration_list
       config = config_list[xcode_config]
 
@@ -646,12 +629,16 @@ module AnnFlavorCocoapods
         user_project.main_group.new_reference(xcconfig_path)
       config.base_configuration_reference = xcconfig_ref
 
-      # Points at the [ann-flavor] Merge Info.plist run-script phase's output
-      # (plan 038), not directly at ann/Info/Info-<flavor>.plist -- that file
-      # now holds only the flavor's info_plist: cascade delta, not a complete
-      # plist; the merge phase composes it with Runner/Info.plist (base) at
-      # build time and writes the result here.
-      config.build_settings['INFOPLIST_FILE'] = '$(DERIVED_FILE_DIR)/Info-merged.plist'
+      # Points at merge_info_plist's output (ann/Info/merged/<flavor>.plist),
+      # not directly at ann/Info/Info-<flavor>.plist -- that file holds only
+      # the flavor's info_plist: cascade delta, not a complete plist;
+      # merge_info_plist composes it with Runner/Info.plist (base) at
+      # pod-install time and writes the result here. `info_plist_path` is
+      # relative to `user_project.project_dir` (== $(SRCROOT) at build time,
+      # confirmed via STEP-2.11 real-project verification -- see the comment
+      # on xcconfig_path above), so relative-to-$(SRCROOT) is what
+      # merge_info_plist/merge_entitlements are expected to return.
+      config.build_settings['INFOPLIST_FILE'] = "$(SRCROOT)/#{info_plist_path}"
       config.build_settings['ASSETCATALOG_COMPILER_APPICON_NAME'] = icon_name
       # entitlements: is opt-in (unlike INFOPLIST_FILE/the icon catalog, which
       # every flavor always has) -- only set CODE_SIGN_ENTITLEMENTS when the
@@ -662,7 +649,7 @@ module AnnFlavorCocoapods
       # longer exists on disk (a build-breaking dangling reference, not
       # merely a stale value like most other settings here).
       if entitlements_path
-        config.build_settings['CODE_SIGN_ENTITLEMENTS'] = entitlements_path
+        config.build_settings['CODE_SIGN_ENTITLEMENTS'] = "$(SRCROOT)/#{entitlements_path}"
       else
         config.build_settings.delete('CODE_SIGN_ENTITLEMENTS')
       end
@@ -808,138 +795,53 @@ module AnnFlavorCocoapods
     # flavor-specific" and gave nothing else (e.g. a CocoaPods plugin like
     # ann_ads) any way to contribute Info.plist keys, since INFOPLIST_FILE
     # pointed at the fully-resolved flavor file and Runner/Info.plist was
-    # never read again. This phase moves that composition to build time
-    # instead, so Runner/Info.plist stays a live, always-consulted base layer.
+    # never read again. This composition used to happen as a build-time
+    # PBXShellScriptBuildPhase (plan 038/039); plan 040-follow-up moved it
+    # here, to pod-install time, because every value it needs (the flavor
+    # name, both source files) is already fully known at post_integrate time
+    # -- there is no genuine build-time input. A script phase producing the
+    # file CODE_SIGN_ENTITLEMENTS/INFOPLIST_FILE point at is what caused a
+    # real, unfixable "Cycle inside Runner" failure in Xcode's new build
+    # system: any PBXShellScriptBuildPhase with declared output_paths becomes
+    # a graph node XCBuild must order relative to a shared per-target
+    # "ModuleVerifierTaskProducer" gate that framework-embed phases (Pods,
+    # SPM packages alike) are also gated behind -- no position in
+    # build_phases avoids it, confirmed live against ledger across several
+    # failed attempts (0.4.1-0.4.5). Writing a plain static file at
+    # post_integrate time, before Xcode ever opens the project to build,
+    # removes the script phase (and its graph node) entirely -- the same
+    # pattern CocoaPods' own Pods-Runner-Info.plist already uses.
     #
-    # Uses PlistBuddy (/usr/libexec/PlistBuddy), not python3/ruby -- PlistBuddy
-    # ships as part of Xcode itself, so this phase has no dependency on any
-    # scripting runtime beyond what Xcode already requires (OQ-1,
-    # docs/03-planning/features/038-info-plist-build-time-merge.md).
+    # Returns the merged file's path (relative to `user_project.project_dir`,
+    # suitable for a build setting like `$(SRCROOT)/<path>` -- callers pass
+    # the absolute path through as INFOPLIST_FILE, see configure_build_settings).
     #
-    # Runs before_compile, ahead of Xcode's own Info.plist processing --
-    # INFOPLIST_FILE (set in configure_build_configuration) points at this
-    # phase's output, not at either source file directly.
-    def self.inject_merge_info_plist_phase(target)
-      script = <<~SHELL
-        # Injected by ann-flavor-cocoapods: compose the final Info.plist from
-        # two layers -- Runner/Info.plist (generic/base) and the flavor-
-        # specific ann/Info/Info-<flavor>.plist (annspec.yaml's info_plist:
-        # cascade) -- with the flavor layer winning on any key collision.
-        # See docs/03-planning/features/038-info-plist-build-time-merge.md.
-        PLISTBUDDY=/usr/libexec/PlistBuddy
-        BASE="${SRCROOT}/Runner/Info.plist"
-        FLAVOR_NAME="${CONFIGURATION#*-}"
-        FLAVOR_PLIST="${SRCROOT}/ann/Info/Info-${FLAVOR_NAME}.plist"
-        OUT="${DERIVED_FILE_DIR}/Info-merged.plist"
-
-        if [ ! -f "$BASE" ]; then
-          echo "error: [ann-flavor] Runner/Info.plist not found at $BASE"
-          exit 1
-        fi
+    # `build_type` (e.g. "debug"/"release"/a custom build_types key) picks
+    # which of ios_generator.dart's per-flavor-per-build-type delta files to
+    # read -- annspec.yaml's info_plist: cascade is valid at build_types.<bt>
+    # level (REQ-FLVR-00110), so this must resolve per build type, not once
+    # per flavor, or a build-type-scoped override is silently dropped.
+    def self.merge_info_plist(project_dir, flavor_key, build_type)
+      base_path = File.join(project_dir, 'Runner', 'Info.plist')
+      flavor_path = File.join(project_dir, 'ann', 'Info', "Info-#{flavor_key}-#{build_type}.plist")
+      relative_out_path = File.join('ann', 'Info', 'merged', "#{flavor_key}-#{build_type}.plist")
+      out_path = File.join(project_dir, relative_out_path)
+
+      unless File.exist?(base_path)
+        raise "[ann-flavor-cocoapods] Runner/Info.plist not found at #{base_path}"
+      end
 
-        # Start from a full copy of the base layer -- every key
-        # Runner/Info.plist already has is correct by default; only the
-        # flavor delta's keys need explicit merging in below.
-        cp "$BASE" "$OUT"
+      merged = read_plist(base_path)
 
-        if [ ! -f "$FLAVOR_PLIST" ]; then
-          echo "warning: [ann-flavor] no flavor Info.plist found for '$FLAVOR_NAME' at $FLAVOR_PLIST -- using Runner/Info.plist unmerged."
-          exit 0
-        fi
-
-        # Enumerate the flavor delta's top-level keys. PlistBuddy "Print" with
-        # no key path dumps the whole dict; grep the top-level "Key = " lines
-        # (four leading spaces = depth 1 in PlistBuddy's indented dump format).
-        FLAVOR_KEYS=$("$PLISTBUDDY" -c "Print" "$FLAVOR_PLIST" | grep -E '^    [A-Za-z]' | sed 's/ =.*//' | sed 's/^ *//')
-
-        for KEY in $FLAVOR_KEYS; do
-          # OQ-2: warn (non-fatal) only on a genuine collision -- Runner/Info.plist
-          # already had this key, with a different value, before the flavor delta
-          # is applied. A net-new key (not previously in Runner/Info.plist) is not
-          # a collision and stays silent -- that's the expected, common case.
-          # Compared via PlistBuddy's human-readable Print output, which is
-          # good enough for equality-detection purposes even though it can't
-          # reliably tell types apart (see the VALUE_XML extraction below,
-          # which is what actually determines the merged value/type).
-          BASE_VALUE=$("$PLISTBUDDY" -c "Print :$KEY" "$OUT" 2>/dev/null)
-          BASE_HAD_KEY=$?
-          FLAVOR_VALUE=$("$PLISTBUDDY" -c "Print :$KEY" "$FLAVOR_PLIST")
-
-          if [ "$BASE_HAD_KEY" -eq 0 ] && [ "$BASE_VALUE" != "$FLAVOR_VALUE" ]; then
-            echo "[ann-flavor] Info.plist: '$KEY' overridden by flavor value ($FLAVOR_NAME) -- Runner/Info.plist's value ignored for this build."
-          fi
-
-          # Extract the flavor value's own XML fragment (e.g. <string>x</string>,
-          # <true/>, <integer>42</integer>, <array>...</array>) via PlistBuddy's
-          # -x (XML) output, scoped to just this key, stripping the <plist
-          # version="1.0">...</plist> wrapper that -x always adds. This
-          # preserves the flavor delta's real plist type -- Print's
-          # human-readable output alone can't distinguish an integer 42 from
-          # the string "42", or a bool true from the string "true", so a
-          # scalar-vs-composite TYPE guess from Print was unreliable and has
-          # been replaced with this approach (verified against a real
-          # PlistBuddy: bool/int/real/string/array/dict all round-trip
-          # correctly this way, plan 038 STEP-02).
-          VALUE_XML=$("$PLISTBUDDY" -x -c "Print :$KEY" "$FLAVOR_PLIST" | sed -n '/<plist version/,/<\\/plist>/p' | sed '1d;$d')
-
-          "$PLISTBUDDY" -c "Delete :$KEY" "$OUT" >/dev/null 2>&1
-          FRAGMENT=$(mktemp /tmp/ann-flavor-plist-fragment.XXXXXX)
-          cat > "$FRAGMENT" <<XMLEOF
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-        <dict>
-        <key>$KEY</key>
-        $VALUE_XML
-        </dict>
-        </plist>
-        XMLEOF
-          "$PLISTBUDDY" -c "Merge \\"$FRAGMENT\\"" "$OUT"
-          rm -f "$FRAGMENT"
-        done
-      SHELL
+      if File.exist?(flavor_path)
+        merge_plist_layer!(merged, read_plist(flavor_path), "Info.plist", "#{flavor_key}-#{build_type}")
+      else
+        puts "ann-flavor-cocoapods: no flavor Info.plist found for '#{flavor_key}' (#{build_type}) at #{flavor_path} -- using Runner/Info.plist unmerged."
+      end
 
-      # Find-or-update in place, rather than delete+recreate -- same
-      # idempotency rationale as inject_build_info_phase above.
-      existing = target.build_phases.find { |p| p.respond_to?(:name) && p.name == '[ann-flavor] Merge Info.plist' }
-      phase = existing || target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-      phase.name = '[ann-flavor] Merge Info.plist'
-      phase.shell_path = '/bin/sh'
-      phase.shell_script = script
-      phase.show_env_vars_in_log = '0'
-      # Declares this phase's output so Xcode's build system understands the
-      # dependency (same technique already used for the Firebase-copy phase's
-      # output_paths) -- suppresses "input file not found" for INFOPLIST_FILE
-      # referencing a path nothing else produces until this phase runs.
-      phase.output_paths = ['$(DERIVED_FILE_DIR)/Info-merged.plist']
-      # NOT declaring input_paths on Check Pods Manifest.lock's output here
-      # (tried in v0.4.1) -- see the identical, fuller explanation on
-      # inject_merge_entitlements_phase below for why that direction was
-      # actually the cause of the real "Cycle inside Runner" failure, not a
-      # (partial) fix for it.
-
-      # Appended at the END of build_phases, not unshifted to the front --
-      # see the identical, fuller explanation on inject_merge_entitlements_phase
-      # below. This phase's output (INFOPLIST_FILE) is only consumed at
-      # packaging/signing time, which is late; it has no reason to race
-      # framework/resource-copy phases early in the build.
-      #
-      # Repositions unconditionally, even when `existing` -- see the identical
-      # note on inject_merge_entitlements_phase for why (a pre-v0.4.2 project
-      # would otherwise never actually get repositioned on re-`pod install`).
-      #
-      # Uses << , NOT push -- Xcodeproj::Project::ObjectList (build_phases'
-      # real class) overrides <</insert/unshift/delete to also update the
-      # object's reference count/registration in the project's global
-      # objects table, but does NOT override push. Array#push silently falls
-      # through to the plain Array behavior, leaving the phase referenced in
-      # buildPhases but never actually registered as a project object --
-      # confirmed live: this produced a real, silently-corrupt
-      # project.pbxproj (a dangling buildPhases reference to a UUID with no
-      # matching object), which then failed at Xcode build time with "Build
-      # input file cannot be found" for this phase's declared output.
-      target.build_phases.delete(phase) if existing
-      target.build_phases << phase
+      FileUtils.mkdir_p(File.dirname(out_path))
+      Xcodeproj::Plist.write_to_path(merged, out_path)
+      relative_out_path
     end
 
     # Composes the final .entitlements file Xcode actually signs with, from
@@ -947,154 +849,78 @@ module AnnFlavorCocoapods
     # not exist at all) and the flavor-specific ann/Entitlements/<flavor>
     # .entitlements delta (annspec.yaml's entitlements: cascade, opt-in --
     # may also not exist) -- with the flavor layer winning on any key
-    # collision. Plan 039: mirrors inject_merge_info_plist_phase (plan 038)
-    # exactly -- same PlistBuddy-based merge (entitlements files and Info.plist
-    # are both plain Apple XML property lists; PlistBuddy has no notion of
-    # file "kind" beyond that), same find-or-update idempotency, same
-    # collision-warning behavior. The one real difference: unlike
-    # Runner/Info.plist (every Xcode project has one), most projects have no
-    # Runner.entitlements at all -- a missing base file here is a normal,
-    # non-fatal case (starts from an empty plist dict), not the fatal error
-    # Merge Info.plist treats a missing Runner/Info.plist as.
-    def self.inject_merge_entitlements_phase(target)
-      script = <<~SHELL
-        # Injected by ann-flavor-cocoapods: compose the final .entitlements file
-        # from two layers -- Runner.entitlements (generic/base, may not exist)
-        # and the flavor-specific ann/Entitlements/<flavor>.entitlements delta
-        # (annspec.yaml's entitlements: cascade, may also not exist) -- with the
-        # flavor layer winning on any key collision. Mirrors [ann-flavor] Merge
-        # Info.plist (plan 038) -- see plan 039 for why entitlements needed the
-        # same redesign.
-        PLISTBUDDY=/usr/libexec/PlistBuddy
-        BASE="${SRCROOT}/Runner/Runner.entitlements"
-        FLAVOR_NAME="${CONFIGURATION#*-}"
-        FLAVOR_FILE="${SRCROOT}/ann/Entitlements/${FLAVOR_NAME}.entitlements"
-        OUT="${DERIVED_FILE_DIR}/Entitlements-merged.entitlements"
-
-        if [ -f "$BASE" ]; then
-          cp "$BASE" "$OUT"
-        else
-          # No stock Runner.entitlements -- start from an empty plist dict
-          # rather than failing; the flavor delta (if any) is still applied
-          # below.
-          cat > "$OUT" <<PLISTEOF
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-        <dict/>
-        </plist>
-        PLISTEOF
-        fi
+    # collision. Mirrors merge_info_plist exactly -- see its comment for why
+    # this moved from a build-time script phase to pod-install time. The one
+    # real difference: unlike Runner/Info.plist (every Xcode project has
+    # one), most projects have no Runner.entitlements at all -- a missing
+    # base file here is a normal, non-fatal case (starts from an empty plist
+    # dict), not the fatal error merge_info_plist treats a missing
+    # Runner/Info.plist as.
+    #
+    # Returns the merged file's path, or nil when there's nothing to sign
+    # with at all (no stock Runner.entitlements AND no flavor delta) --
+    # callers use a nil return to decide whether to set CODE_SIGN_ENTITLEMENTS.
+    #
+    # `build_type` resolves per build type -- see the identical note on
+    # merge_info_plist for why (entitlements: is valid at build_types.<bt>
+    # level too, REQ-FLVR-00120).
+    def self.merge_entitlements(project_dir, flavor_key, build_type)
+      base_path = File.join(project_dir, 'Runner', 'Runner.entitlements')
+      flavor_path = File.join(project_dir, 'ann', 'Entitlements', "#{flavor_key}-#{build_type}.entitlements")
+      relative_out_path = File.join('ann', 'Entitlements', 'merged', "#{flavor_key}-#{build_type}.entitlements")
+      out_path = File.join(project_dir, relative_out_path)
+
+      has_base = File.exist?(base_path)
+      has_flavor = File.exist?(flavor_path)
+      unless has_base || has_flavor
+        # Nothing to sign with -- delete a previously-written merged file
+        # rather than leaving it stale on disk (CODE_SIGN_ENTITLEMENTS is
+        # correctly cleared by the caller either way, but an orphaned file
+        # here is still generated-output drift the same "disposable, always
+        # regenerated" convention ios/ann/ uses elsewhere is meant to avoid).
+        FileUtils.rm_f(out_path)
+        return nil
+      end
 
-        if [ ! -f "$FLAVOR_FILE" ]; then
-          echo "[ann-flavor] Entitlements: no flavor delta found for '$FLAVOR_NAME' at $FLAVOR_FILE -- using Runner.entitlements unmerged."
-          exit 0
-        fi
+      merged = has_base ? read_plist(base_path) : {}
+      if has_flavor
+        merge_plist_layer!(merged, read_plist(flavor_path), "Entitlements", "#{flavor_key}-#{build_type}")
+      elsif has_base
+        puts "ann-flavor-cocoapods: no flavor delta found for '#{flavor_key}' (#{build_type}) at #{flavor_path} -- using Runner.entitlements unmerged."
+      end
 
-        FLAVOR_KEYS=$("$PLISTBUDDY" -c "Print" "$FLAVOR_FILE" | grep -E '^    [A-Za-z]' | sed 's/ =.*//' | sed 's/^ *//')
-
-        for KEY in $FLAVOR_KEYS; do
-          BASE_VALUE=$("$PLISTBUDDY" -c "Print :$KEY" "$OUT" 2>/dev/null)
-          BASE_HAD_KEY=$?
-          FLAVOR_VALUE=$("$PLISTBUDDY" -c "Print :$KEY" "$FLAVOR_FILE")
-
-          if [ "$BASE_HAD_KEY" -eq 0 ] && [ "$BASE_VALUE" != "$FLAVOR_VALUE" ]; then
-            echo "[ann-flavor] Entitlements: '$KEY' overridden by flavor value ($FLAVOR_NAME) -- Runner.entitlements' value ignored for this build."
-          fi
-
-          VALUE_XML=$("$PLISTBUDDY" -x -c "Print :$KEY" "$FLAVOR_FILE" | sed -n '/<plist version/,/<\\/plist>/p' | sed '1d;$d')
-
-          "$PLISTBUDDY" -c "Delete :$KEY" "$OUT" >/dev/null 2>&1
-          FRAGMENT=$(mktemp /tmp/ann-flavor-entitlements-fragment.XXXXXX)
-          cat > "$FRAGMENT" <<XMLEOF
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-        <dict>
-        <key>$KEY</key>
-        $VALUE_XML
-        </dict>
-        </plist>
-        XMLEOF
-          "$PLISTBUDDY" -c "Merge \\"$FRAGMENT\\"" "$OUT"
-          rm -f "$FRAGMENT"
-        done
-      SHELL
+      FileUtils.mkdir_p(File.dirname(out_path))
+      Xcodeproj::Plist.write_to_path(merged, out_path)
+      relative_out_path
+    end
 
-      existing = target.build_phases.find { |p| p.respond_to?(:name) && p.name == '[ann-flavor] Merge Entitlements' }
-      phase = existing || target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-      phase.name = '[ann-flavor] Merge Entitlements'
-      phase.shell_path = '/bin/sh'
-      phase.shell_script = script
-      phase.show_env_vars_in_log = '0'
-      phase.output_paths = ['$(DERIVED_FILE_DIR)/Entitlements-merged.entitlements']
-      # NOT declaring input_paths on Check Pods Manifest.lock's own output
-      # here (tried in v0.4.1/0.4.2/0.4.3 as "belt-and-suspenders"). Confirmed
-      # live (yet again, against ledger) that this input_paths declaration is
-      # what CAUSES the real "Cycle inside Runner" failure, not a partial fix
-      # for it: this phase's output feeds ProcessProductPackaging (signing),
-      # which Xcode's new build system gates behind a chain of task producers
-      # (ModuleVerifierTaskProducer et al) — declaring Check Pods Manifest
-      # .lock's result file as this phase's OWN input routes this phase
-      # through that SAME gate chain from the other direction, since Check
-      # Pods Manifest.lock's output is itself gated behind
-      # ModuleVerifierTaskProducer too. The Firebase framework-copy phases
-      # are gated behind that identical chain — closing a genuine cycle no
-      # matter where this phase sits in build_phases. Xcode's own error
-      # message ("moving Check Pods Manifest.lock so it runs before the
-      # phase that depends on its outputs") is describing exactly this
-      # self-inflicted dependency, not a real requirement — this phase never
-      # actually needed Check Pods Manifest.lock's result as an input;
-      # output_paths + running after the Pods/framework-copy phases (via
-      # position, below) is sufficient on its own.
-      #
-      # Appended at the END of build_phases, not unshifted to the front.
-      # v0.4.1 tried fixing this phase's real "Cycle inside Runner" Xcode
-      # build failure (confirmed live against ledger, a project with real
-      # CocoaPods frameworks like Firebase) purely by declaring input_paths
-      # above -- that alone was NOT sufficient. The actual cycle: this
-      # phase's output feeds ProcessProductPackaging (entitlements signing,
-      # gated behind a chain of task producers Xcode's new build system
-      # shares with the Firebase framework-copy phases), and unshifting this
-      # phase to the very FRONT of build_phases put it, and its declared
-      # output dependency, on the same task-producer chain the framework
-      # copy phases are gated behind on the other side -- a genuine cycle
-      # through shared gates, not resolvable by declaring one more input.
-      # CODE_SIGN_ENTITLEMENTS/INFOPLIST_FILE are only consumed at
-      # packaging/signing time, which is late in the build -- this phase has
-      # no real reason to run before Sources/Frameworks/Resources/Embed
-      # Frameworks at all. Appending it at the end removes it from that
-      # shared gate entirely.
-      #
-      # Repositions unconditionally, even when `existing` (a project that
-      # already has this phase from a pre-v0.4.2 install, sitting at the
-      # front from the old unshift) -- otherwise re-running `pod install`
-      # after upgrading the gem would never actually move it, and the real
-      # bug would persist for every already-affected consumer.
-      #
-      # Uses << , NOT push -- see the identical, fuller explanation on
-      # inject_merge_info_plist_phase above. Array#push silently bypasses
-      # ObjectList's reference-count/registration bookkeeping, producing a
-      # real, silently-corrupt project.pbxproj (buildPhases referencing a
-      # UUID with no matching object) that fails at Xcode build time with
-      # "Build input file cannot be found" -- confirmed live against ledger.
-      target.build_phases.delete(phase) if existing
-      target.build_phases << phase
+    # Reads a plist file as a plain Ruby Hash. Uses `plutil -convert json`
+    # (a system tool, ships with Xcode/macOS), NOT Xcodeproj::Plist
+    # .read_from_path -- that method's pure-Ruby CFPropertyList fallback path
+    # is broken under Ruby 3.4 in this environment (missing stdlib 'kconv',
+    # confirmed live) -- same workaround already established in this repo's
+    # own spec suite (merge_entitlements_script_spec.rb/
+    # merge_info_plist_script_spec.rb).
+    def self.read_plist(path)
+      json = `#{PLUTIL} -convert json -o - "#{path}"`
+      raise "[ann-flavor-cocoapods] plutil failed to read #{path}" unless $?.success?
+
+      JSON.parse(json)
     end
 
-    # Removes a previously-injected Merge Entitlements phase when no flavor
-    # needs entitlements anymore (annspec.yaml's entitlements: cascade was
-    # removed, and no stock Runner.entitlements exists either) -- entitlements
-    # are opt-in overall, so a stale phase with nothing to sign would be dead
-    # weight left in project.pbxproj. Uses ObjectList#delete (not plain
-    # Array#reject!/select), same rationale as the stale "[ann-flavor] Remove
-    # Firebase plist" cleanup above -- plain array removal only drops the
-    # phase from target.build_phases, leaving the object itself permanently
-    # orphaned in the project's global objects table.
-    def self.remove_merge_entitlements_phase(target)
-      target.build_phases.select do |p|
-        p.respond_to?(:name) && p.name == '[ann-flavor] Merge Entitlements'
-      end.each { |p| target.build_phases.delete(p) }
+    # Merges `layer` into `base` in place, one top-level key at a time --
+    # `layer`'s value wins on any key both define, printing a one-line notice
+    # so an unintentional override is easy to spot (same collision-warning
+    # behavior the build-time script phases had). A net-new key (not
+    # previously in `base`) is not a collision and stays silent -- the
+    # expected, common case.
+    def self.merge_plist_layer!(base, layer, kind, flavor_key)
+      layer.each do |key, value|
+        if base.key?(key) && base[key] != value
+          puts "ann-flavor-cocoapods: [#{kind}] '#{key}' overridden by flavor value (#{flavor_key}) -- base value ignored for this build."
+        end
+        base[key] = value
+      end
     end
   end
 end

data/lib/ann_flavor_cocoapods/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorCocoapods
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - ANN Solutions