ann-flavor-cocoapods 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23222a95fea37f9217a01fd582557f9310c254e54958ed9414c1a27a67cf3b8
-  data.tar.gz: 610b16041b64c3ae03482638436ebd1e965ffc756c29276316d003692086afd5
+  metadata.gz: ae5474a82cba4428fdfaf19c72bb2c7ac53b219bb50baf70ff246988947cb83f
+  data.tar.gz: 5c57f69715847b50fc8fa930f6c182cc074c37389c1f0184734a73c09ee2d5a0
 SHA512:
-  metadata.gz: 02cf0c93b06b3ed7d461a49e3e6582c857ce79b0f6f6da198d23f7d1ba82c3929ac000599c7ab991bf3ae56ff4f5eb45d39f54a3f382468872e8a6197b678821
-  data.tar.gz: 9667804d92e78f14267f30c997f100dd22eb80d543693d8863e75efeefd4580e1e979f5371f3ca296c27fda7aadb267ac7ff6d3b619996452498a1b4a7f95180
+  metadata.gz: 61bef50c9f7da4eada063a61ed60184de9790105eafee5c63c064e8c48419c96003d79ebdd77f3a70e0e32a75b160bd7c7b637d6c1cc5f6f70d6b2e0c85b6a69
+  data.tar.gz: 196fbefce09aff6c9055616a6a073a11c22687868e2aca9f0c9c1086d010849b032d40e3a3247e3d4281ca9d0543bd8ea1eb5bc1145bcf47a6f5bdf12fd9b6ef

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.4.2
+
+### Fixed
+- **0.4.1's fix for "Cycle inside Runner" was incomplete — the cycle could
+  still occur.** Declaring `input_paths` on `[CP] Check Pods Manifest.lock`'s
+  own output (0.4.1) correctly ordered `[ann-flavor] Merge Entitlements`/
+  `[ann-flavor] Merge Info.plist` after that one phase, but both were still
+  `unshift`ed to the very *front* of `build_phases`. Confirmed live (again,
+  against `ledger`) that the real cycle ran through a longer chain: these
+  phases' outputs feed `ProcessProductPackaging` (entitlements/Info.plist
+  signing), which is gated behind a chain of Xcode task producers that the
+  Firebase framework-copy phases are *also* gated behind — being first in
+  `build_phases` put both on the same shared gate from opposite directions,
+  a genuine cycle no single `input_paths` declaration could resolve.
+  `CODE_SIGN_ENTITLEMENTS`/`INFOPLIST_FILE` are only consumed at packaging/
+  signing time, which is late in the build — neither phase has any real
+  reason to run before `Sources`/`Frameworks`/`Resources`/`Embed Frameworks`
+  at all. Fixed by appending both phases at the **end** of `build_phases`
+  instead of unshifting them to the front (`input_paths` from 0.4.1 kept as
+  belt-and-suspenders). Also now unconditionally repositions the phase to
+  the end even when it already exists from a prior install — a project that
+  picked up the incomplete 0.4.1 fix needs this to actually move it on the
+  next `pod install`, not just leave it in place.
+
 ## 0.4.1
 
 ### Fixed

data/lib/ann_flavor_cocoapods/podfile_helper.rb

@@ -912,14 +912,22 @@ module AnnFlavorCocoapods
       # 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']
-      # Same explicit-ordering fix as inject_merge_entitlements_phase below --
-      # without this, Xcode's new build system can report a "Cycle inside
-      # Runner" against a real project with real Pod frameworks, since
-      # output_paths alone isn't enough to order this phase after CocoaPods'
-      # own "[CP] Check Pods Manifest.lock" phase.
+      # Belt-and-suspenders alongside the append-at-end position fix below --
+      # explicitly orders this phase after CocoaPods' own "[CP] Check Pods
+      # Manifest.lock" phase regardless of list position.
       phase.input_paths = ['$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt']
 
-      target.build_phases.unshift(phase) unless existing
+      # 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`).
+      target.build_phases.delete(phase) if existing
+      target.build_phases.push(phase)
     end
 
     # Composes the final .entitlements file Xcode actually signs with, from
@@ -1008,22 +1016,36 @@ module AnnFlavorCocoapods
       phase.shell_script = script
       phase.show_env_vars_in_log = '0'
       phase.output_paths = ['$(DERIVED_FILE_DIR)/Entitlements-merged.entitlements']
-      # Declaring this phase's own output_paths (above) is not enough for
-      # Xcode's new build system to order it correctly relative to CocoaPods'
-      # own "[CP] Check Pods Manifest.lock" phase -- unshift only affects
-      # build_phases list order, which CocoaPods' own installer can (and,
-      # against a real project with real Pod frameworks like Firebase, does)
-      # re-order after this hook runs. Without an explicit input_paths
-      # dependency, Xcode's dependency-cycle detector can flag a real cycle
-      # ("Cycle inside Runner") between this phase's output (consumed by
-      # ProcessProductPackaging for the merged entitlements) and Check Pods
-      # Manifest.lock's own output, even though no true cycle exists --
-      # explicitly declaring Check Pods Manifest.lock's result file as an
-      # input here removes the ambiguity Xcode's scheduler was resolving
-      # incorrectly. Confirmed live against ledger (real Firebase Pods).
+      # Belt-and-suspenders alongside the append-at-end position fix below --
+      # explicitly orders this phase after CocoaPods' own "[CP] Check Pods
+      # Manifest.lock" phase regardless of list position.
       phase.input_paths = ['$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt']
 
-      target.build_phases.unshift(phase) unless existing
+      # 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.
+      target.build_phases.delete(phase) if existing
+      target.build_phases.push(phase)
     end
 
     # Removes a previously-injected Merge Entitlements phase when no flavor

data/lib/ann_flavor_cocoapods/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorCocoapods
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

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