ann-flavor-cocoapods 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4a6fb9baad3561d14ffa73da2e419ebbaa0664edf12924875484973e5e5f21
-  data.tar.gz: a88e357ca0d0fdf957a3640229d7f98a852a058d3ea442f5333d8c6f02c1393c
+  metadata.gz: ae5474a82cba4428fdfaf19c72bb2c7ac53b219bb50baf70ff246988947cb83f
+  data.tar.gz: 5c57f69715847b50fc8fa930f6c182cc074c37389c1f0184734a73c09ee2d5a0
 SHA512:
-  metadata.gz: a156d31659cb317a3e114adda24d44048e0a8c28bf781f23b50f3821a8e0eb84e19aabf2ac57beec9da4d3e7cc192ab3182acf8a4f95c5177eb8ff3445298df0
-  data.tar.gz: 7c4b22bba78a36cb28338c38152e2126ea9b9d92007e633d1b6684bb40b2db1a30ca5f7ac74ad0855e31a3ae65bcca98210d3e6d8c2f98cac7664dbded19ee18
+  metadata.gz: 61bef50c9f7da4eada063a61ed60184de9790105eafee5c63c064e8c48419c96003d79ebdd77f3a70e0e32a75b160bd7c7b637d6c1cc5f6f70d6b2e0c85b6a69
+  data.tar.gz: 196fbefce09aff6c9055616a6a073a11c22687868e2aca9f0c9c1086d010849b032d40e3a3247e3d4281ca9d0543bd8ea1eb5bc1145bcf47a6f5bdf12fd9b6ef

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # 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
+- **`pod install`/Xcode build failed with "Cycle inside Runner; building
+  could produce unreliable results"** against a real project with real
+  CocoaPods frameworks (confirmed live: Firebase). The `[ann-flavor] Merge
+  Entitlements` and `[ann-flavor] Merge Info.plist` build phases (0.3.0/
+  0.4.0) declared `output_paths` but no `input_paths`, so nothing told
+  Xcode's new build system these phases must run after CocoaPods' own
+  `[CP] Check Pods Manifest.lock` phase — `build_phases.unshift` only
+  controls list order, which CocoaPods' own installer reorders after this
+  Podfile hook runs anyway. Fixed by declaring `input_paths =
+  ['$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt']` on both
+  phases, matching Check Pods Manifest.lock's own declared output — Xcode
+  now has an explicit dependency to resolve the ordering, rather than a
+  cycle its scheduler was resolving incorrectly.
+
 ## 0.4.0
 
 ### Added

data/lib/ann_flavor_cocoapods/podfile_helper.rb

@@ -912,8 +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']
-
-      target.build_phases.unshift(phase) unless existing
+      # 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']
+
+      # 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
@@ -1002,8 +1016,36 @@ module AnnFlavorCocoapods
       phase.shell_script = script
       phase.show_env_vars_in_log = '0'
       phase.output_paths = ['$(DERIVED_FILE_DIR)/Entitlements-merged.entitlements']
-
-      target.build_phases.unshift(phase) unless existing
+      # 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']
+
+      # 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.0"
+  VERSION = "0.4.2"
 end

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/model.rb

@@ -86,18 +86,18 @@ module AnnFlavorCore
 
   IosDefault = Struct.new(
     :id, :name, :version_name, :version_code, :main_file,
-    :admob, :icon, :credentials, :firebase, :build_types, :custom, :dart_defines, :info_plist, :entitlements, :sdk,
+    :admob, :icon, :credentials, :firebase, :build_types, :custom, :dart_defines, :env, :info_plist, :entitlements, :sdk,
     keyword_init: true
   ) do
-    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults, env: {})
   end
 
   IosFlavor = Struct.new(
     :id, :id_suffix, :name, :name_suffix, :version_name, :version_code,
-    :main_file, :admob, :icon, :firebase, :stores, :credentials, :build_types, :custom, :dart_defines, :info_plist, :entitlements,
+    :main_file, :admob, :icon, :firebase, :stores, :credentials, :build_types, :custom, :dart_defines, :env, :info_plist, :entitlements,
     keyword_init: true
   ) do
-    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults, env: {})
   end
 
   IosCredentials        = Struct.new(:signing, :app_store, keyword_init: true)
@@ -160,10 +160,10 @@ module AnnFlavorCore
     :id_suffix, :name_suffix,
     :firebase, :auth, :admob,
     :minify_enabled, :shrink_resources, :lint_check_release_builds,
-    :ndk_version, :ndk_debug_symbol_level, :ndk_abi_filters, :custom, :dart_defines, :info_plist, :entitlements,
+    :ndk_version, :ndk_debug_symbol_level, :ndk_abi_filters, :custom, :dart_defines, :env, :info_plist, :entitlements,
     keyword_init: true
   ) do
-    def self.defaults = new(id_suffix: '', name_suffix: '', ndk_abi_filters: [], custom: {}, dart_defines: DartDefines.defaults)
+    def self.defaults = new(id_suffix: '', name_suffix: '', ndk_abi_filters: [], custom: {}, dart_defines: DartDefines.defaults, env: {})
   end
 
   FirebaseConfig = Struct.new(:project_id, :config_file, :service_account, :target, keyword_init: true)

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/parser.rb

@@ -43,6 +43,14 @@ module AnnFlavorCore
       end
     end
 
+    # `env:` — a flat string key-value map, cascading the same as `custom`/
+    # `dart_defines` but with no nested groups: generic native build-setting
+    # overrides (e.g. iOS xcconfig), not the Dart-only `custom` mechanism.
+    def self.parse_env(m)
+      return {} unless m.is_a?(Hash)
+      m.transform_values { |v| v.nil? ? '' : v.to_s }
+    end
+
     def self.normalize_custom_value(v)
       return v.map { |e| e.nil? ? '' : e.to_s } if v.is_a?(Array)
       v
@@ -162,6 +170,7 @@ module AnnFlavorCore
         build_types:  parse_build_type_configs(h(m, 'build_types')),
         custom: parse_custom_config(h(m, 'custom')),
         dart_defines: parse_dart_defines(h(m, 'dart_defines')),
+        env: parse_env(h(m, 'env')),
         info_plist:   m['info_plist'],
         entitlements: m['entitlements'],
         sdk:          (parse_ios_sdk(h(m, 'sdk')) unless h(m, 'sdk').empty?),
@@ -189,6 +198,7 @@ module AnnFlavorCore
         build_types:  parse_build_type_configs(h(m, 'build_types')),
         custom: parse_custom_config(h(m, 'custom')),
         dart_defines: parse_dart_defines(h(m, 'dart_defines')),
+        env: parse_env(h(m, 'env')),
         info_plist:   m['info_plist'],
         entitlements: m['entitlements'],
       )
@@ -322,6 +332,7 @@ module AnnFlavorCore
           ndk_abi_filters:            (v['ndkAbiFilters'].is_a?(Array) ? v['ndkAbiFilters'] : []),
           custom:                     parse_custom_config(h(v, 'custom')),
           dart_defines:               parse_dart_defines(h(v, 'dart_defines')),
+          env:                        parse_env(h(v, 'env')),
           info_plist:                 v['info_plist'],
           entitlements:               v['entitlements'],
         )

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/strict_mode_checker.rb

@@ -27,7 +27,10 @@ module AnnFlavorCore
     # fields -- same free-form treatment as custom/dart_defines, and deliberately
     # NOT in RECURSION_TARGETS since there is no single fixed struct type to
     # recurse into.
-    FREE_FORM_FIELDS = %i[custom dart_defines info_plist entitlements].freeze
+    #
+    # env is a flat string Hash of arbitrary, user-declared native
+    # build-setting keys (e.g. REVERSED_CLIENT_ID) -- same free-form treatment.
+    FREE_FORM_FIELDS = %i[custom dart_defines env info_plist entitlements].freeze
 
     # (containing_struct, field_name) => target_struct — only the "does this field
     # recurse, and into what" relationship; the valid-keys-within-that-struct question

metadata

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