ann-flavor-cocoapods 0.1.39 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae52557478525628b402c7b13b8adb941cc23ea40f8b3b35b92b463124d65604
-  data.tar.gz: f2dc91944fce473c165b379b71c789eba4e8f7d606de693a9137ac23387b2107
+  metadata.gz: 68dcf959d5d5f927bc43085645168885f76ac29cff73dc973fa9d0d5a8809beb
+  data.tar.gz: 9d214c8beb19db807200490e5a66e4bc6b22b20539cc950abbf316bb059f3ca7
 SHA512:
-  metadata.gz: a5cb40ac4c29185fd367bc703fb3e5e165dcc19e28592b9303637648e6f3b28a5dfed1846317a7811ac2952eb2269deb7f3c0af4a4da4d84ea15a0aeeda71702
-  data.tar.gz: 6c32a064349c7eb9f49f984adb396ef96a7caa0e7832065c27811fba44d1b750f4737ab5674107a138194e0b7211dd667f1723358076d6097856e77cd30ca5fa
+  metadata.gz: dfd4c329b80c085c88607557aaa9027793f7a43c680751019608acdfb16d930a71ed9dc7d464a5ea7e2beb608af88148661ac3324083ea40aa8d370b0787b7dd
+  data.tar.gz: a0c24e164cc92f315382be34c593a6326151db80e33b69f473b7fbb3a3bb19431b6520e4357b7475ea39c0ec573d1a3b3b40ec6486c73fbf2eb872f967191748

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.2.0
+
+### Added
+- **Wires the new `entitlements:` schema field (see `ann_flutter_flavor`
+  1.1.0) into the Xcode build.** When `ios/ann/Entitlements/<flavor>.entitlements`
+  exists on disk for a flavor, `configure_build_configuration` sets
+  `CODE_SIGN_ENTITLEMENTS` to it — the same find-or-create-by-name pattern
+  already used for `INFOPLIST_FILE`. `entitlements:` is opt-in (unlike
+  `info_plist`/the icon catalog, which every flavor always has): a flavor with
+  no generated entitlements file gets no `CODE_SIGN_ENTITLEMENTS` set at all,
+  and a stale value from a flavor's `entitlements:` being removed from
+  `annspec.yaml` is explicitly cleared on the next `pod install` rather than
+  left as a dangling, build-breaking reference to a file that no longer
+  exists. `CODE_SIGN_ENTITLEMENTS` is also added to `PROJECT_LEVEL_EXCLUDED_KEYS`
+  (same shadowing risk as `INFOPLIST_FILE`/`PRODUCT_BUNDLE_IDENTIFIER`).
+
 ## 0.1.39
 
 ### Fixed

data/lib/ann_flavor_cocoapods/podfile_helper.rb

@@ -179,9 +179,20 @@ module AnnFlavorCocoapods
 
                 assert_icon_generated!(user_project, flavor_key, icon_name)
 
+                # Unlike the icon catalog and Info.plist, entitlements: is
+                # opt-in -- ios_generator.dart's _generateEntitlements skips
+                # creating ios/ann/Entitlements/ entirely when no annspec.yaml
+                # entitlements: block and no stock Runner.entitlements exist
+                # anywhere. Only set CODE_SIGN_ENTITLEMENTS when the file
+                # actually exists on disk; leaving it unset is correct (no
+                # entitlements to sign with), not an error condition.
+                entitlements_path = "ann/Entitlements/#{flavor_key}.entitlements"
+                entitlements_file = File.join(user_project.project_dir.to_s, 'ann', 'Entitlements', "#{flavor_key}.entitlements")
+                entitlements_path = nil unless File.exist?(entitlements_file)
+
                 configure_build_configuration(
                   target, user_project, xcode_config, xcconfig_path, info_plist_path,
-                  icon_name
+                  icon_name, entitlements_path
                 )
               end
 
@@ -584,9 +595,10 @@ module AnnFlavorCocoapods
     # `xcodebuild` time — excluding it here is what fixes that.
     PROJECT_LEVEL_EXCLUDED_KEYS = %w[
       PRODUCT_BUNDLE_IDENTIFIER INFOPLIST_FILE ASSETCATALOG_COMPILER_APPICON_NAME
+      CODE_SIGN_ENTITLEMENTS
     ].freeze
 
-    def self.configure_build_configuration(target, user_project, xcode_config, xcconfig_path, info_plist_path, icon_name)
+    def self.configure_build_configuration(target, user_project, xcode_config, xcconfig_path, info_plist_path, icon_name, entitlements_path = nil)
       config_list = target.build_configuration_list
       config = config_list[xcode_config]
 
@@ -614,6 +626,19 @@ module AnnFlavorCocoapods
 
       config.build_settings['INFOPLIST_FILE'] = 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
+      # caller found a generated file on disk. Also explicitly clear a
+      # find-or-create'd EXISTING config's stale value when a flavor's
+      # entitlements: block was removed from annspec.yaml, rather than
+      # silently leaving Xcode signing with an entitlements file that no
+      # 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
+      else
+        config.build_settings.delete('CODE_SIGN_ENTITLEMENTS')
+      end
       # flutter create's own stock Debug/Release configs never set
       # MARKETING_VERSION at all (confirmed against a real project) --
       # CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)" is present on the

data/lib/ann_flavor_cocoapods/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorCocoapods
-  VERSION = "0.1.39"
+  VERSION = "0.2.0"
 end

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

@@ -86,7 +86,7 @@ module AnnFlavorCore
 
   IosDefault = Struct.new(
     :id, :name, :version_name, :version_code, :main_file,
-    :admob, :icon, :credentials, :firebase, :build_types, :custom, :dart_defines, :info_plist, :sdk,
+    :admob, :icon, :credentials, :firebase, :build_types, :custom, :dart_defines, :info_plist, :entitlements, :sdk,
     keyword_init: true
   ) do
     def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
@@ -94,7 +94,7 @@ module AnnFlavorCore
 
   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,
+    :main_file, :admob, :icon, :firebase, :stores, :credentials, :build_types, :custom, :dart_defines, :info_plist, :entitlements,
     keyword_init: true
   ) do
     def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
@@ -160,7 +160,7 @@ 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,
+    :ndk_version, :ndk_debug_symbol_level, :ndk_abi_filters, :custom, :dart_defines, :info_plist, :entitlements,
     keyword_init: true
   ) do
     def self.defaults = new(id_suffix: '', name_suffix: '', ndk_abi_filters: [], custom: {}, dart_defines: DartDefines.defaults)
@@ -213,6 +213,7 @@ module AnnFlavorCore
     :effective_custom,
     :effective_dart_defines,
     :effective_info_plist,
+    :effective_entitlements,
     keyword_init: true
   )
 end

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

@@ -163,6 +163,7 @@ module AnnFlavorCore
         custom: parse_custom_config(h(m, 'custom')),
         dart_defines: parse_dart_defines(h(m, 'dart_defines')),
         info_plist:   m['info_plist'],
+        entitlements: m['entitlements'],
         sdk:          (parse_ios_sdk(h(m, 'sdk')) unless h(m, 'sdk').empty?),
       )
     end
@@ -189,6 +190,7 @@ module AnnFlavorCore
         custom: parse_custom_config(h(m, 'custom')),
         dart_defines: parse_dart_defines(h(m, 'dart_defines')),
         info_plist:   m['info_plist'],
+        entitlements: m['entitlements'],
       )
     end
 
@@ -321,6 +323,7 @@ module AnnFlavorCore
           custom:                     parse_custom_config(h(v, 'custom')),
           dart_defines:               parse_dart_defines(h(v, 'dart_defines')),
           info_plist:                 v['info_plist'],
+          entitlements:               v['entitlements'],
         )
       end
     end

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/resolver.rb

@@ -119,6 +119,9 @@ module AnnFlavorCore
         # in the consuming plugin, not in the core).
         effective_info_plist:   flavor.build_types[build_type]&.info_plist || flavor.info_plist ||
                                  defaults.build_types[build_type]&.info_plist || defaults.info_plist,
+        # Same whole-value most-specific-wins rule as effective_info_plist above.
+        effective_entitlements: flavor.build_types[build_type]&.entitlements || flavor.entitlements ||
+                                 defaults.build_types[build_type]&.entitlements || defaults.entitlements,
       )
     end
 

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

@@ -21,12 +21,13 @@ module AnnFlavorCore
     # Fields whose value is a free-form Hash (arbitrary user-declared keys are data,
     # not schema) -- exempted from unknown-key checking entirely, at any level.
     #
-    # info_plist is additionally a union (an inline Hash OR a plain file-path String),
-    # so even when its value IS a Hash, its keys are raw Info.plist keys the user
-    # controls, never our own schema 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].freeze
+    # info_plist and entitlements are additionally a union (an inline Hash OR a
+    # plain file-path String), so even when their value IS a Hash, its keys are
+    # raw Info.plist/entitlement keys the user controls, never our own schema
+    # 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
 
     # (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.1.39
+  version: 0.2.0
 platform: ruby
 authors:
 - ANN Solutions