ann-flavor-flutter 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defb9dd7c5b8628bf31becb0117001e9468f0534acd8adf739e3505dd0c28628
-  data.tar.gz: b2fc3b531e1870e811bff2eca5371bc823a2079ab9dd8e0298dc698c16811efc
+  metadata.gz: fd7cce396ef86ea1e15205e7440d3755a79707eeaa55126a84bce553d0785add
+  data.tar.gz: 10d3037745026703bcd2ae17d93ea6467fb8fe3b6d0962f228b23f2d25e4e7cc
 SHA512:
-  metadata.gz: 79151855669eea4e3c328da868b4024a47b5669e43cb38e72f47333f480da0bb48c52f1a81e8ea85fb9b5095d75face5a88c72289873f8137b134b565927a464
-  data.tar.gz: e366bb91225e5adcca0e31bc5d4dce65909d165e4b1735a710f19b4f484b61094fa2b660ddf78fd270b6b5d30bf4c3679596332e4efca3f81b5a63bf462d0633
+  metadata.gz: b3312b0e1231f50e7c99bb0ea43580245bd5bae4814dfd63d790e29fa41f9bc197f5492dcb3e0f9b120ac95e8cbbd4c27666874ed0abc18caf8b0183d0013a26
+  data.tar.gz: 174e5a6e6a016a6772ad6d764056b4576e09279f03130a0e91e36e323d4f0bb3f9b6dc4db825d3405a3feeefc034bfe1f42c8dbf7b1cdd5217f0a13bc1eb8308

data/.gitignore

@@ -1,2 +1,7 @@
 /pkg/
 Gemfile.lock
+
+# Vendored ann_flavor_core source, generated transiently during publish (DEF-058).
+# Never committed for real — CI/`make publish-fastlane` `git add -f` it briefly
+# so `gem build`'s `git ls-files`-based file list includes it, then discard it.
+/lib/vendor/

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.7
+
+### Fixed
+- `dart_defines` (`annspec.yaml`'s `android.default.dart_defines` / per-flavor overrides) was silently never applied to `flutter build` when compilation happened as part of `upload_to_play_store`, `upload_to_app_store`, or `upload_to_cloudflare` — only a manual `bundle exec fastlane android compile_build` invocation picked it up, since the flag was injected only into the generated Fastfile's standalone `compile_build` lane, which those upload/publish helpers never call. `compile_build` (the shared helper in `lanes_annai.rb`) now resolves `dart_defines` itself at runtime, so every caller gets it automatically — this also means a flavor-level `dart_defines` override is now honored, which the old generation-time injection could never represent (it could only see default-level values). ([#59](https://github.com/anntech-dev/ann-flavor-tooling/issues/59))
+
+## 0.4.6
+
+### Fixed
+- Loading this gem (`require 'ann_flavor_flutter'` / `require 'fastlane/plugin/ann_flavor_flutter'`) failed with `cannot load such file -- ann_flavor_core` — the 0.4.5 core-delegation change added a hard `require 'ann_flavor_core'` in `utils_spec_loader.rb`, but `ann_flavor_core` is intentionally never published to RubyGems (ADR-008). The published gem now vendors `ann_flavor_core`'s source and resolves it automatically; local monorepo development is unaffected. ([#58](https://github.com/anntech-dev/ann-flavor-tooling/issues/58))
+
 ## 0.4.5
 
 ### Changed

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

data/lib/ann_flavor_flutter.rb

@@ -1,5 +1,13 @@
 # This file is loaded by require 'annai-flutter-flavor'
 
+# The published gem vendors ann_flavor_core's source under lib/vendor/ (ADR-008:
+# ann_flavor_core is never published to RubyGems, only path/git dependencies).
+# In the monorepo this directory doesn't exist, and ann_flavor_core resolves via
+# the real gem installed by the local Gemfile's `path:` dependency instead.
+vendored_core_lib = File.expand_path('vendor/ann_flavor_core/lib', __dir__)
+$LOAD_PATH.unshift(vendored_core_lib) if File.directory?(vendored_core_lib) &&
+                                          !$LOAD_PATH.include?(vendored_core_lib)
+
 # Load the version (Good Practice)
 require 'ann_flavor_flutter/version'
 

data/lib/fastlane/plugin/ann_flavor_flutter/helper/lanes_annai.rb

@@ -113,6 +113,22 @@ module FastlaneFlutterFlavor
           end
         end
 
+        # dart_defines (REQ-DDEF-00040): resolved here — not only in the
+        # standalone Fastfile `compile_build` lane — so every caller that
+        # compiles via this helper gets it, including upload_to_play_store,
+        # upload_to_app_store, and upload_to_cloudflare, which call this
+        # method directly and previously never applied dart_defines at all
+        # (DEF-059, #59). A caller-supplied additional_parameter is preserved
+        # and the resolved flags are appended alongside it as separate argv
+        # elements (Fastlane::Actions.sh below is called with a splatted
+        # array, so each flag must be its own element, not one combined
+        # string). additional_parameter may already be an Array here (the web
+        # branch above turns it into one) or a String.
+        dart_defines_flags = @specLoader.get_dart_defines_flags(@platform, flavor, build_config)
+        unless dart_defines_flags.empty?
+          additional_parameter = Array(additional_parameter).flatten.reject { |p| p.to_s.empty? } + dart_defines_flags
+        end
+
         # Base command parts
         command_parts = [
           "flutter", "build",

data/lib/fastlane/plugin/ann_flavor_flutter/helper/utils_spec_loader.rb

@@ -329,5 +329,27 @@ module FastlaneFlutterFlavor
       resolved = resolve(platform, flavor_name, build_config)
       resolved&.effective_auth&.reversed_client_id
     end
+
+    # Merges common + compile-scoped dart_defines (compile wins on collision,
+    # per REQ-DDEF-00015) into individual --dart-define=KEY=VALUE flags for
+    # `flutter build`. Returns [] when there's nothing to emit. Returned as
+    # separate array elements (not a single joined string) so callers can pass
+    # them straight through to Fastlane::Actions.sh's argv-array form without
+    # each flag being treated as one combined shell argument.
+    #
+    # REQ-DDEF-00040's default-only scoping decision applies here too:
+    # `resolve` folds flavor-level overrides in via the core's 4-level cascade,
+    # so a flavor with its own dart_defines still resolves correctly per call —
+    # unlike the (now-removed) generated-Fastfile-lane version, which could
+    # only represent default-level dart_defines since it was a single static
+    # lane shared across every flavor.
+    def get_dart_defines_flags(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
+      defines = resolved&.effective_dart_defines
+      return [] unless defines
+
+      merged = (defines.common || {}).merge(defines.compile || {})
+      merged.map { |k, v| "--dart-define=#{k}=#{v}" }
+    end
   end
 end

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/ios_resolution.rb

@@ -0,0 +1,37 @@
+require_relative 'resolver'
+
+module AnnFlavorCore
+  # Shared iOS bundle-ID / Firebase-path resolution — used by both
+  # ann-flavor-cocoapods and ann-flavor-fastlane so the two plugins compute
+  # identical effective values instead of independently re-deriving them
+  # (plan-030 Phase 6 / REQ-CDEL-00070).
+  module IosResolution
+    # Effective bundle ID for a flavor at a specific build type. Always applies
+    # the full cascade (default → flavor → build_type suffix) — there is no
+    # build-type-less variant; callers must pass the actual build type they are
+    # assembling for.
+    #
+    # An unknown flavor key falls back to the unsuffixed default id (matches
+    # pre-consolidation behavior — never raises for a missing flavor).
+    def self.bundle_id(ios_platform, flavor_key, build_type)
+      flavor = ios_platform.flavors[flavor_key.to_s] || AnnFlavorCore::IosFlavor.defaults
+      Resolver.resolve_ios_flavor(flavor, ios_platform.default, build_type.to_s).effective_id
+    end
+
+    # Effective Firebase config file path for a flavor at a specific build
+    # type. Full 4-level cascade via the core resolver (config_file,
+    # project_id, service_account, target). When only project_id is set (no
+    # config_file), synthesizes the stable generated-plist path convention:
+    #   #{generated_dir}/GoogleService-Info-#{flavor_key}-#{build_type}.plist
+    #
+    # Returns nil when neither config_file nor project_id is set.
+    def self.firebase_config_path(ios_platform, flavor_key, build_type, generated_dir: 'lib/generated/firebase')
+      flavor = ios_platform.flavors[flavor_key.to_s] || AnnFlavorCore::IosFlavor.defaults
+      resolved = Resolver.resolve_ios_flavor(flavor, ios_platform.default, build_type.to_s)
+      fb = resolved.effective_firebase
+      return nil if fb.nil?
+
+      fb.config_file || (fb.project_id && "#{generated_dir}/GoogleService-Info-#{flavor_key}-#{build_type}.plist")
+    end
+  end
+end

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

@@ -0,0 +1,196 @@
+module AnnFlavorCore
+  # ── dart_defines ────────────────────────────────────────────────────────────
+  #
+  # compile/run/deploy are reserved action-scope sub-keys (REQ-DDEF-00015).
+  # +common+ holds keys declared directly under dart_defines — they apply to every
+  # action. Each action Hash is resolved as an addition on top of +common+, never a
+  # replacement.
+  DartDefines = Struct.new(:common, :compile, :run, :deploy, keyword_init: true) do
+    def self.defaults = new(common: {}, compile: {}, run: {}, deploy: {})
+  end
+
+  # ── Top-level ───────────────────────────────────────────────────────────────
+
+  AnnSpec = Struct.new(:app, :enabled, :debug_config, :tooling, keyword_init: true) do
+    def self.defaults = new(app: AnnApp.new, enabled: true, debug_config: DebugConfig.new)
+  end
+
+  AnnApp = Struct.new(:android, :ios, :web, :windows, :general, :integrations, keyword_init: true)
+
+  # ── Tooling (REQ-TOOL-00010 — top-level, non-cascading) ──────────────────────
+
+  ToolingConfig = Struct.new(:gradle_plugin, :cocoapods_plugin, :fastlane_plugin, keyword_init: true)
+
+  # ── Integrations ─────────────────────────────────────────────────────────────
+
+  AnnIntegrations = Struct.new(:fastlane, :melos, :firebase, keyword_init: true) do
+    def self.defaults = new(fastlane: false, melos: false, firebase: false)
+  end
+
+  # ── Android ─────────────────────────────────────────────────────────────────
+
+  AndroidPlatform = Struct.new(:default, :flavors, keyword_init: true) do
+    def self.defaults = new(default: AndroidDefault.new, flavors: {})
+  end
+
+  AndroidDefault = Struct.new(
+    :id, :name, :version_name, :version_code, :main_file,
+    :admob, :icon, :sdk, :credentials, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  AndroidFlavor = Struct.new(
+    :id, :id_suffix, :name, :name_suffix, :version_name, :version_code,
+    :main_file, :admob, :icon, :firebase, :stores, :credentials, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  AndroidSdk = Struct.new(:min_sdk, :compile_sdk, :target_sdk, keyword_init: true)
+
+  AndroidCredentials    = Struct.new(:signing, :google_play, :samsung_galaxy, :amazon, keyword_init: true)
+  AndroidSigning        = Struct.new(:key_file, keyword_init: true)
+  GooglePlayCredentials = Struct.new(:api_key, keyword_init: true)
+  SamsungGalaxyCredentials = Struct.new(:seller_id, :api_key, keyword_init: true)
+  AmazonCredentials     = Struct.new(:client_id, :client_secret, keyword_init: true)
+
+  # ── iOS ─────────────────────────────────────────────────────────────────────
+
+  IosPlatform = Struct.new(:default, :flavors, keyword_init: true) do
+    def self.defaults = new(default: IosDefault.new, flavors: {})
+  end
+
+  IosDefault = Struct.new(
+    :id, :name, :version_name, :version_code, :main_file,
+    :admob, :icon, :credentials, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  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,
+    keyword_init: true
+  ) do
+    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  IosCredentials        = Struct.new(:signing, :app_store, keyword_init: true)
+  IosSigning            = Struct.new(:team_id, keyword_init: true)
+  AppStoreCredentials   = Struct.new(
+    :api_key, :export_options_plist, :export_options_team_id,
+    :export_options_signing_certificate,
+    keyword_init: true
+  )
+
+  # ── Web ─────────────────────────────────────────────────────────────────────
+
+  WebPlatform = Struct.new(:default, :flavors, keyword_init: true) do
+    def self.defaults = new(default: WebDefault.new, flavors: {})
+  end
+
+  CloudflareConfig = Struct.new(:project_name, :account_id, :branch, :mode, keyword_init: true)
+
+  WebDefault = Struct.new(
+    :id, :name, :version_name, :version_code, :main_file, :icon, :cloudflare, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  WebFlavor = Struct.new(
+    :id, :id_suffix, :name, :name_suffix, :version_name, :version_code,
+    :main_file, :icon, :cloudflare, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  # ── Windows ─────────────────────────────────────────────────────────────────
+
+  WindowsPlatform = Struct.new(:default, :flavors, keyword_init: true) do
+    def self.defaults = new(default: WindowsDefault.new, flavors: {})
+  end
+
+  WindowsDefault = Struct.new(
+    :id, :name, :version_name, :version_code, :main_file, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  WindowsFlavor = Struct.new(
+    :id, :id_suffix, :name, :name_suffix, :version_name, :version_code,
+    :main_file, :firebase, :build_types, :custom, :dart_defines,
+    keyword_init: true
+  ) do
+    def self.defaults = new(id_suffix: '', name_suffix: '', build_types: {}, custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  # ── Shared types ─────────────────────────────────────────────────────────────
+
+  AdmobConfig = Struct.new(:gms_ads_id, keyword_init: true)
+
+  BuildTypeConfig = Struct.new(
+    :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,
+    keyword_init: true
+  ) do
+    def self.defaults = new(id_suffix: '', name_suffix: '', ndk_abi_filters: [], custom: {}, dart_defines: DartDefines.defaults)
+  end
+
+  FirebaseConfig = Struct.new(:project_id, :config_file, :service_account, :target, keyword_init: true)
+
+  AuthConfig = Struct.new(:client_id, :reversed_client_id, :others, keyword_init: true) do
+    def self.defaults = new(others: {})
+  end
+
+  FlavorStores             = Struct.new(:google_play, :samsung_galaxy, :amazon, :app_store, keyword_init: true)
+  GooglePlayFlavorStore    = Struct.new(:priority, keyword_init: true)
+  SamsungGalaxyFlavorStore = Struct.new(:app_id, keyword_init: true)
+  AmazonFlavorStore        = Struct.new(:app_id, keyword_init: true)
+  AppStoreFlavorStore      = Struct.new(:apple_id, :team_id, keyword_init: true)
+
+  class GeneralConfig
+    def self.defaults = new
+  end
+
+  DebugConfig = Struct.new(
+    :print_debug, :print_build_and_flavor_info, :print_sdk_versions, :print_release_build_type_info,
+    keyword_init: true
+  ) do
+    def self.defaults
+      new(
+        print_debug: false,
+        print_build_and_flavor_info: true,
+        print_sdk_versions: true,
+        print_release_build_type_info: false
+      )
+    end
+  end
+
+  # ── Resolved output types ────────────────────────────────────────────────────
+
+  ResolvedSpec   = Struct.new(:android, :ios, :web, :windows, keyword_init: true)
+  ResolvedFlavor = Struct.new(:flavor_name, :by_build_type, keyword_init: true)
+
+  ResolvedBuildOutput = Struct.new(
+    :flavor_name, :build_type,
+    :effective_id, :effective_name,
+    :effective_version_name, :effective_version_code,
+    :effective_main_file,
+    :effective_firebase, :effective_auth,
+    :effective_gms_ads_id,
+    :effective_icon,
+    :effective_cloudflare,
+    :effective_custom,
+    :effective_dart_defines,
+    keyword_init: true
+  )
+end

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

@@ -0,0 +1,378 @@
+require 'yaml'
+require_relative 'model'
+
+module AnnFlavorCore
+  #
+  # Single source of truth for parsing annspec.yaml.
+  #
+  # Two entry points:
+  #   AnnFlavorCore::Parser.parse(yaml_string)   — from raw YAML text
+  #   AnnFlavorCore::Parser.parse_file(path)     — from a file path
+  #   AnnFlavorCore::Parser.from_hash(hash)      — from a pre-parsed Hash
+  #                                                 (e.g. in-memory UI data)
+  #
+  # After parsing, pass the AnnSpec to AnnFlavorCore::Resolver.resolve_all
+  # to obtain all resolved (effective) values per flavor × build-type.
+  #
+  module Parser
+    def self.parse(yaml_string)
+      raw = YAML.safe_load(yaml_string, aliases: true) || {}
+      from_hash(raw)
+    end
+
+    def self.parse_file(path)
+      parse(File.read(path))
+    end
+
+    def self.from_hash(raw)
+      app_hash = h(raw, 'app')
+      tooling_hash = h(raw, 'tooling')
+      AnnSpec.new(
+        app:    parse_ann_app(app_hash),
+        enabled:      raw.fetch('enabled', true),
+        debug_config: parse_debug_config(h(raw, 'debug')),
+        tooling:      (parse_tooling(tooling_hash) unless tooling_hash.empty?),
+      )
+    end
+
+    def self.parse_custom_config(m)
+      return {} unless m.is_a?(Hash)
+      m.transform_values do |group_val|
+        next {} unless group_val.is_a?(Hash)
+        group_val.transform_values { |v| normalize_custom_value(v) }
+      end
+    end
+
+    def self.normalize_custom_value(v)
+      return v.map { |e| e.nil? ? '' : e.to_s } if v.is_a?(Array)
+      v
+    end
+
+    def self.parse_tooling(m)
+      ToolingConfig.new(
+        gradle_plugin:    m['gradle_plugin'],
+        cocoapods_plugin: m['cocoapods_plugin'],
+        fastlane_plugin:  m['fastlane_plugin'],
+      )
+    end
+
+    # ── AnnApp ────────────────────────────────────────────────────────────────
+
+    def self.parse_ann_app(m)
+      AnnApp.new(
+        android:      (parse_android(h(m, 'android'))            unless h(m, 'android').empty?),
+        ios:          (parse_ios(h(m, 'ios'))                    unless h(m, 'ios').empty?),
+        web:          (parse_web(h(m, 'web'))                    unless h(m, 'web').empty?),
+        windows:      (parse_windows(h(m, 'windows'))            unless h(m, 'windows').empty?),
+        general:      (parse_general(h(m, 'general'))            unless h(m, 'general').empty?),
+        integrations: (parse_integrations(h(m, 'integrations'))  unless h(m, 'integrations').empty?),
+      )
+    end
+
+    def self.parse_integrations(m)
+      AnnIntegrations.new(
+        fastlane: m.fetch('fastlane', false),
+        melos:    m.fetch('melos',    false),
+        firebase: m.fetch('firebase', false),
+      )
+    end
+
+    # ── Android ───────────────────────────────────────────────────────────────
+
+    def self.parse_android(m)
+      AndroidPlatform.new(
+        default: parse_android_default(h(m, 'default')),
+        flavors: parse_flavors(h(m, 'flavor')) { |v| parse_android_flavor(v) },
+      )
+    end
+
+    def self.parse_android_default(m)
+      AndroidDefault.new(
+        id:           m['id'],
+        name:         m['name'],
+        version_name: m['version_name']&.to_s,
+        version_code: m['version_code']&.to_i,
+        main_file:    m['main_file'],
+        admob:        (AdmobConfig.new(gms_ads_id: h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']) unless (h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']).nil?),
+        icon:         m['icon'],
+        sdk:          (parse_android_sdk(h(m, 'sdk'))                        unless h(m, 'sdk').empty?),
+        credentials:  (parse_android_credentials(h(m, 'credentials'))        unless h(m, 'credentials').empty?),
+        firebase:     (parse_firebase_config(h(m, 'firebase'))               unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_android_flavor(m)
+      AndroidFlavor.new(
+        id:           m['id'],
+        id_suffix:    m.fetch('id_suffix', '').to_s,
+        name:         m['name'],
+        name_suffix:  m.fetch('name_suffix', '').to_s,
+        version_name: m['version_name']&.to_s,
+        version_code: m['version_code']&.to_i,
+        main_file:    m['main_file'],
+        admob:        (AdmobConfig.new(gms_ads_id: h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']) unless (h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']).nil?),
+        icon:         m['icon'],
+        firebase:     (parse_firebase_config(h(m, 'firebase'))               unless h(m, 'firebase').empty?),
+        stores:       (parse_flavor_stores(h(m, 'stores'))             unless h(m, 'stores').empty?),
+        credentials:  (parse_android_credentials(h(m, 'credentials')) unless h(m, 'credentials').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_android_sdk(m)
+      AndroidSdk.new(min_sdk: m['minSdk'], compile_sdk: m['compileSdk'], target_sdk: m['targetSdk'])
+    end
+
+    def self.parse_android_credentials(m)
+      AndroidCredentials.new(
+        signing:        (AndroidSigning.new(key_file: h(m, 'signing')['key_file'])                             unless h(m, 'signing').empty?),
+        google_play:    (GooglePlayCredentials.new(api_key: h(m, 'google_play')['api_key'])                    unless h(m, 'google_play').empty?),
+        samsung_galaxy: (SamsungGalaxyCredentials.new(seller_id: h(m, 'samsung_galaxy')['seller_id'],
+                           api_key: h(m, 'samsung_galaxy')['api_key'])                                        unless h(m, 'samsung_galaxy').empty?),
+        amazon:         (AmazonCredentials.new(client_id: h(m, 'amazon')['client_id'],
+                           client_secret: h(m, 'amazon')['client_secret'])                                    unless h(m, 'amazon').empty?),
+      )
+    end
+
+    # ── iOS ───────────────────────────────────────────────────────────────────
+
+    def self.parse_ios(m)
+      IosPlatform.new(
+        default: parse_ios_default(h(m, 'default')),
+        flavors: parse_flavors(h(m, 'flavor')) { |v| parse_ios_flavor(v) },
+      )
+    end
+
+    def self.parse_ios_default(m)
+      IosDefault.new(
+        id:           m['id'],
+        name:         m['name'],
+        version_name: m['version_name']&.to_s,
+        version_code: m['version_code']&.to_i,
+        main_file:    m['main_file'],
+        admob:        (AdmobConfig.new(gms_ads_id: h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']) unless (h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']).nil?),
+        icon:         m['icon'],
+        credentials:  (parse_ios_credentials(h(m, 'credentials')) unless h(m, 'credentials').empty?),
+        firebase:     (parse_firebase_config(h(m, 'firebase'))    unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_ios_flavor(m)
+      IosFlavor.new(
+        id:           m['id'],
+        id_suffix:    m.fetch('id_suffix', '').to_s,
+        name:         m['name'],
+        name_suffix:  m.fetch('name_suffix', '').to_s,
+        version_name: m['version_name']&.to_s,
+        version_code: m['version_code']&.to_i,
+        main_file:    m['main_file'],
+        admob:        (AdmobConfig.new(gms_ads_id: h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']) unless (h(m, 'admob')['gms_ads_id'] || m['gms_ads_id']).nil?),
+        icon:         m['icon'],
+        firebase:     (parse_firebase_config(h(m, 'firebase'))               unless h(m, 'firebase').empty?),
+        stores:       (parse_flavor_stores(h(m, 'stores'))           unless h(m, 'stores').empty?),
+        credentials:  (parse_ios_credentials(h(m, 'credentials'))    unless h(m, 'credentials').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_ios_credentials(m)
+      IosCredentials.new(
+        signing:   (IosSigning.new(team_id: h(m, 'signing')['team_id'])                                       unless h(m, 'signing').empty?),
+        app_store: (AppStoreCredentials.new(
+                     api_key:                          h(m, 'app_store')['api_key'],
+                     export_options_plist:             h(m, 'app_store')['export_options_plist'],
+                     export_options_team_id:           h(m, 'app_store')['export_options_team_id'],
+                     export_options_signing_certificate: h(m, 'app_store')['export_options_signing_certificate'],
+                   )                                                                                            unless h(m, 'app_store').empty?),
+      )
+    end
+
+    # ── Web ───────────────────────────────────────────────────────────────────
+
+    def self.parse_web(m)
+      WebPlatform.new(
+        default: parse_web_default(h(m, 'default')),
+        flavors: parse_flavors(h(m, 'flavor')) { |v| parse_web_flavor(v) },
+      )
+    end
+
+    def self.parse_web_default(m)
+      WebDefault.new(
+        id: m['id'], name: m['name'],
+        version_name: m['version_name']&.to_s, version_code: m['version_code']&.to_i,
+        main_file: m['main_file'], icon: m['icon'],
+        cloudflare: parse_cloudflare(h(m, 'cloudflare')),
+        firebase: (parse_firebase_config(h(m, 'firebase')) unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_web_flavor(m)
+      WebFlavor.new(
+        id: m['id'], id_suffix: m.fetch('id_suffix', '').to_s,
+        name: m['name'], name_suffix: m.fetch('name_suffix', '').to_s,
+        version_name: m['version_name']&.to_s, version_code: m['version_code']&.to_i,
+        main_file: m['main_file'], icon: m['icon'],
+        cloudflare: parse_cloudflare(h(m, 'cloudflare')),
+        firebase: (parse_firebase_config(h(m, 'firebase')) unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_cloudflare(m)
+      return nil if m.empty?
+      CloudflareConfig.new(
+        project_name: m['project_name'],
+        account_id:   m['account_id'],
+        branch:       m['branch'],
+        mode:         m['mode'],
+      )
+    end
+
+    # ── Windows ───────────────────────────────────────────────────────────────
+
+    def self.parse_windows(m)
+      WindowsPlatform.new(
+        default: parse_windows_default(h(m, 'default')),
+        flavors: parse_flavors(h(m, 'flavor')) { |v| parse_windows_flavor(v) },
+      )
+    end
+
+    def self.parse_windows_default(m)
+      WindowsDefault.new(
+        id: m['id'], name: m['name'],
+        version_name: m['version_name']&.to_s, version_code: m['version_code']&.to_i,
+        main_file: m['main_file'],
+        firebase: (parse_firebase_config(h(m, 'firebase')) unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    def self.parse_windows_flavor(m)
+      WindowsFlavor.new(
+        id: m['id'], id_suffix: m.fetch('id_suffix', '').to_s,
+        name: m['name'], name_suffix: m.fetch('name_suffix', '').to_s,
+        version_name: m['version_name']&.to_s, version_code: m['version_code']&.to_i,
+        main_file: m['main_file'],
+        firebase: (parse_firebase_config(h(m, 'firebase')) unless h(m, 'firebase').empty?),
+        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')),
+      )
+    end
+
+    # ── Shared parsers ────────────────────────────────────────────────────────
+
+    def self.parse_firebase_config(m)
+      FirebaseConfig.new(
+        project_id:      m['project_id'],
+        config_file:     m['config_file'],
+        service_account: m['service_account'],
+        target:          m['target'],
+      )
+    end
+
+    def self.parse_auth_config(m)
+      AuthConfig.new(
+        client_id:          m['clientId'],
+        reversed_client_id: m['reversedClientId'],
+        others:             h(m, 'others'),
+      )
+    end
+
+    def self.parse_build_type_configs(m)
+      m.transform_values do |v|
+        v = v.is_a?(Hash) ? v : {}
+        BuildTypeConfig.new(
+          id_suffix:                  v.fetch('id_suffix', '').to_s,
+          name_suffix:                v.fetch('name_suffix', '').to_s,
+          firebase:                   (parse_firebase_config(h(v, 'firebase'))              unless h(v, 'firebase').empty?),
+          auth:                       (parse_auth_config(h(v, 'auth'))                      unless h(v, 'auth').empty?),
+          admob:                      (AdmobConfig.new(gms_ads_id: h(v, 'admob')['gms_ads_id']) unless h(v, 'admob').empty?),
+          minify_enabled:             v['minifyEnabled'],
+          shrink_resources:           v['shrinkResources'],
+          lint_check_release_builds:  v['lintCheckReleaseBuilds'],
+          ndk_version:                v['ndkVersion'],
+          ndk_debug_symbol_level:     v['ndkDebugSymbolLevel'],
+          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')),
+        )
+      end
+    end
+
+    def self.parse_flavor_stores(m)
+      FlavorStores.new(
+        google_play:    (GooglePlayFlavorStore.new(priority: h(m, 'google_play')['priority'])            unless h(m, 'google_play').empty?),
+        samsung_galaxy: (SamsungGalaxyFlavorStore.new(app_id: h(m, 'samsung_galaxy')['app_id'])         unless h(m, 'samsung_galaxy').empty?),
+        amazon:         (AmazonFlavorStore.new(app_id: h(m, 'amazon')['app_id'])                        unless h(m, 'amazon').empty?),
+        app_store:      (AppStoreFlavorStore.new(apple_id: h(m, 'app_store')['apple_id'],
+                          team_id: h(m, 'app_store')['team_id'])                                        unless h(m, 'app_store').empty?),
+      )
+    end
+
+    def self.parse_general(_m)
+      GeneralConfig.new
+    end
+
+    def self.parse_debug_config(m)
+      DebugConfig.new(
+        print_debug:                    m.fetch('printDebug', false),
+        print_build_and_flavor_info:    m.fetch('printBuildAndFlavorInfo', true),
+        print_sdk_versions:             m.fetch('printSdkVersions', true),
+        print_release_build_type_info:  m.fetch('printReleaseBuildTypeInfo', false),
+      )
+    end
+
+    def self.parse_flavors(flavor_map, &parse_fn)
+      return {} unless flavor_map.is_a?(Hash)
+      flavor_map.transform_values { |v| parse_fn.call(v.is_a?(Hash) ? v : {}) }
+    end
+
+    # Safe Hash accessor — returns {} when key is missing or value is not a Hash
+    def self.h(map, key)
+      val = map.is_a?(Hash) ? map[key] : nil
+      val.is_a?(Hash) ? val : {}
+    end
+
+    DART_DEFINES_ACTION_KEYS = %w[compile run deploy].freeze
+
+    # Parses dart_defines: — plain string entries are the common map; the three
+    # reserved sub-keys compile/run/deploy (each a nested map) become the
+    # corresponding action scope. Values are coerced to strings.
+    def self.parse_dart_defines(m)
+      return DartDefines.defaults unless m.is_a?(Hash)
+
+      string_map = ->(raw) {
+        return {} unless raw.is_a?(Hash)
+        raw.transform_values { |v| v.nil? ? '' : v.to_s }
+      }
+
+      common = m.reject { |k, _| DART_DEFINES_ACTION_KEYS.include?(k) }
+                .transform_values { |v| v.nil? ? '' : v.to_s }
+
+      DartDefines.new(
+        common:  common,
+        compile: string_map.call(m['compile']),
+        run:     string_map.call(m['run']),
+        deploy:  string_map.call(m['deploy']),
+      )
+    end
+  end
+end

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

@@ -0,0 +1,266 @@
+require_relative 'model'
+
+module AnnFlavorCore
+  module Resolver
+    STANDARD_BUILD_TYPES = %w[debug release profile].freeze
+
+    # ── Low-level cascade helpers (used by all plugins) ───────────────────────
+
+    def self.effective_build_type_suffix(flavor_suffix, default_suffix)
+      flavor_suffix.to_s.empty? ? default_suffix.to_s : flavor_suffix.to_s
+    end
+
+    def self.resolve_id(base_id, id_suffix, build_type_id_suffix = '')
+      base_id.to_s + id_suffix.to_s + build_type_id_suffix.to_s
+    end
+
+    def self.resolve_name(base_name, name_suffix, build_type_name_suffix = '')
+      base_name.to_s + name_suffix.to_s + build_type_name_suffix.to_s
+    end
+
+    # ── High-level resolver ───────────────────────────────────────────────────
+    #
+    # Usage patterns:
+    #
+    #   # From YAML (batch — all platforms, all build types)
+    #   spec = AnnFlavorCore::Parser.parse_file('annspec.yaml')
+    #   resolved = AnnFlavorCore::Resolver.resolve_all(spec)
+    #
+    #   # From in-memory model (e.g. live UI data before saving to YAML)
+    #   output = AnnFlavorCore::Resolver.resolve_android_flavor(flavor, defaults, 'debug')
+
+    def self.resolve_all(spec, build_types: STANDARD_BUILD_TYPES)
+      ResolvedSpec.new(
+        android: spec.app&.android ? resolve_android(spec.app.android, build_types: build_types) : {},
+        ios:     spec.app&.ios     ? resolve_ios(spec.app.ios,         build_types: build_types) : {},
+        web:     spec.app&.web     ? resolve_web(spec.app.web,         build_types: build_types) : {},
+        windows: spec.app&.windows ? resolve_windows(spec.app.windows, build_types: build_types) : {},
+      )
+    end
+
+    def self.resolve_android(platform, build_types: STANDARD_BUILD_TYPES)
+      platform.flavors.each_with_object({}) do |(name, flavor), result|
+        result[name] = ResolvedFlavor.new(
+          flavor_name:   name,
+          by_build_type: build_types.each_with_object({}) { |bt, h| h[bt] = resolve_android_flavor(flavor, platform.default, bt) },
+        )
+      end
+    end
+
+    def self.resolve_ios(platform, build_types: STANDARD_BUILD_TYPES)
+      platform.flavors.each_with_object({}) do |(name, flavor), result|
+        result[name] = ResolvedFlavor.new(
+          flavor_name:   name,
+          by_build_type: build_types.each_with_object({}) { |bt, h| h[bt] = resolve_ios_flavor(flavor, platform.default, bt) },
+        )
+      end
+    end
+
+    def self.resolve_web(platform, build_types: STANDARD_BUILD_TYPES)
+      platform.flavors.each_with_object({}) do |(name, flavor), result|
+        result[name] = ResolvedFlavor.new(
+          flavor_name:   name,
+          by_build_type: build_types.each_with_object({}) { |bt, h| h[bt] = resolve_web_flavor(flavor, platform.default, bt) },
+        )
+      end
+    end
+
+    def self.resolve_windows(platform, build_types: STANDARD_BUILD_TYPES)
+      platform.flavors.each_with_object({}) do |(name, flavor), result|
+        result[name] = ResolvedFlavor.new(
+          flavor_name:   name,
+          by_build_type: build_types.each_with_object({}) { |bt, h| h[bt] = resolve_windows_flavor(flavor, platform.default, bt) },
+        )
+      end
+    end
+
+    # ── Per-flavor resolvers (callable directly from UI / in-memory data) ─────
+
+    def self.resolve_android_flavor(flavor, defaults, build_type)
+      bt = effective_bt_config(flavor.build_types, defaults.build_types, build_type)
+      ResolvedBuildOutput.new(
+        flavor_name:            nil,
+        build_type:             build_type,
+        effective_id:           resolve_id((flavor.id || defaults.id).to_s, flavor.id_suffix.to_s, bt.id_suffix),
+        effective_name:         resolve_name((flavor.name || defaults.name).to_s, flavor.name_suffix.to_s, bt.name_suffix),
+        effective_version_name: (flavor.version_name || defaults.version_name).to_s,
+        effective_version_code: flavor.version_code || defaults.version_code,
+        effective_main_file:    flavor.main_file || defaults.main_file,
+        effective_firebase:     resolve_firebase(flavor.build_types[build_type]&.firebase, flavor.firebase, defaults.build_types[build_type]&.firebase, defaults.firebase),
+        effective_auth:         bt.auth,
+        effective_gms_ads_id:   flavor.admob&.gms_ads_id || defaults.admob&.gms_ads_id,
+        effective_icon:         flavor.icon || defaults.icon,
+        effective_custom:       resolve_custom(defaults.custom, defaults.build_types[build_type]&.custom, flavor.custom, flavor.build_types[build_type]&.custom),
+        effective_dart_defines: resolve_dart_defines(defaults.dart_defines, defaults.build_types[build_type]&.dart_defines, flavor.dart_defines, flavor.build_types[build_type]&.dart_defines),
+      )
+    end
+
+    def self.resolve_ios_flavor(flavor, defaults, build_type)
+      bt = effective_bt_config(flavor.build_types, defaults.build_types, build_type)
+      ResolvedBuildOutput.new(
+        flavor_name:            nil,
+        build_type:             build_type,
+        effective_id:           resolve_id((flavor.id || defaults.id).to_s, flavor.id_suffix.to_s, bt.id_suffix),
+        effective_name:         resolve_name((flavor.name || defaults.name).to_s, flavor.name_suffix.to_s, bt.name_suffix),
+        effective_version_name: (flavor.version_name || defaults.version_name).to_s,
+        effective_version_code: flavor.version_code || defaults.version_code,
+        effective_main_file:    flavor.main_file || defaults.main_file,
+        effective_firebase:     resolve_firebase(flavor.build_types[build_type]&.firebase, flavor.firebase, defaults.build_types[build_type]&.firebase, defaults.firebase),
+        effective_auth:         bt.auth,
+        effective_gms_ads_id:   flavor.admob&.gms_ads_id || defaults.admob&.gms_ads_id,
+        effective_icon:         flavor.icon || defaults.icon,
+        effective_custom:       resolve_custom(defaults.custom, defaults.build_types[build_type]&.custom, flavor.custom, flavor.build_types[build_type]&.custom),
+        effective_dart_defines: resolve_dart_defines(defaults.dart_defines, defaults.build_types[build_type]&.dart_defines, flavor.dart_defines, flavor.build_types[build_type]&.dart_defines),
+      )
+    end
+
+    def self.resolve_web_flavor(flavor, defaults, build_type)
+      bt = effective_bt_config(flavor.build_types, defaults.build_types, build_type)
+      ResolvedBuildOutput.new(
+        flavor_name:            nil,
+        build_type:             build_type,
+        effective_id:           resolve_id((flavor.id || defaults.id).to_s, flavor.id_suffix.to_s, bt.id_suffix),
+        effective_name:         resolve_name((flavor.name || defaults.name).to_s, flavor.name_suffix.to_s, bt.name_suffix),
+        effective_version_name: (flavor.version_name || defaults.version_name).to_s,
+        effective_version_code: flavor.version_code || defaults.version_code,
+        effective_main_file:    flavor.main_file || defaults.main_file,
+        effective_firebase:     resolve_firebase(flavor.build_types[build_type]&.firebase, flavor.firebase, defaults.build_types[build_type]&.firebase, defaults.firebase),
+        effective_auth:         bt.auth,
+        effective_gms_ads_id:   nil,
+        effective_icon:         flavor.icon || defaults.icon,
+        effective_cloudflare:   resolve_cloudflare(flavor.cloudflare, defaults.cloudflare),
+        effective_custom:       resolve_custom(defaults.custom, defaults.build_types[build_type]&.custom, flavor.custom, flavor.build_types[build_type]&.custom),
+        effective_dart_defines: resolve_dart_defines(defaults.dart_defines, defaults.build_types[build_type]&.dart_defines, flavor.dart_defines, flavor.build_types[build_type]&.dart_defines),
+      )
+    end
+
+    def self.resolve_cloudflare(flavor_cf, default_cf)
+      CloudflareConfig.new(
+        project_name: flavor_cf&.project_name,
+        account_id:   flavor_cf&.account_id || default_cf&.account_id,
+        branch:       flavor_cf&.branch     || default_cf&.branch || 'main',
+        mode:         flavor_cf&.mode       || default_cf&.mode   || 'pages',
+      )
+    end
+
+    def self.resolve_windows_flavor(flavor, defaults, build_type)
+      bt = effective_bt_config(flavor.build_types, defaults.build_types, build_type)
+      ResolvedBuildOutput.new(
+        flavor_name:            nil,
+        build_type:             build_type,
+        effective_id:           resolve_id((flavor.id || defaults.id).to_s, flavor.id_suffix.to_s, bt.id_suffix),
+        effective_name:         resolve_name((flavor.name || defaults.name).to_s, flavor.name_suffix.to_s, bt.name_suffix),
+        effective_version_name: (flavor.version_name || defaults.version_name).to_s,
+        effective_version_code: flavor.version_code || defaults.version_code,
+        effective_main_file:    flavor.main_file || defaults.main_file,
+        effective_firebase:     resolve_firebase(flavor.build_types[build_type]&.firebase, flavor.firebase, defaults.build_types[build_type]&.firebase, defaults.firebase),
+        effective_auth:         bt.auth,
+        effective_gms_ads_id:   nil,
+        effective_icon:         nil,
+        effective_custom:       resolve_custom(defaults.custom, defaults.build_types[build_type]&.custom, flavor.custom, flavor.build_types[build_type]&.custom),
+        effective_dart_defines: resolve_dart_defines(defaults.dart_defines, defaults.build_types[build_type]&.dart_defines, flavor.dart_defines, flavor.build_types[build_type]&.dart_defines),
+      )
+    end
+
+    # ── Internal helpers ──────────────────────────────────────────────────────
+
+    # Deep-merges custom config — lowest priority first, key-by-key within each group.
+    def self.resolve_custom(default_custom, default_bt_custom, flavor_custom, flavor_bt_custom)
+      merge = lambda do |base, over|
+        next base if over.nil? || over.empty?
+        result = base.dup
+        over.each { |group, group_map| result[group] = (result[group] || {}).merge(group_map) }
+        result
+      end
+      merge.call(merge.call(merge.call(default_custom || {}, default_bt_custom), flavor_custom), flavor_bt_custom)
+    end
+
+    # Shallow key-union across all four cascade levels — most specific key wins.
+    def self.merge_defines_map(default_map, default_bt_map, flavor_map, flavor_bt_map)
+      (default_map || {})
+        .merge(default_bt_map || {})
+        .merge(flavor_map || {})
+        .merge(flavor_bt_map || {})
+    end
+
+    # Resolves all four dart_defines sub-maps (common + three action scopes)
+    # independently.
+    def self.resolve_dart_defines(default_defines, default_bt_defines, flavor_defines, flavor_bt_defines)
+      d  = default_defines || DartDefines.defaults
+      db = default_bt_defines || DartDefines.defaults
+      f  = flavor_defines || DartDefines.defaults
+      fb = flavor_bt_defines || DartDefines.defaults
+      DartDefines.new(
+        common:  merge_defines_map(d.common,  db.common,  f.common,  fb.common),
+        compile: merge_defines_map(d.compile, db.compile, f.compile, fb.compile),
+        run:     merge_defines_map(d.run,     db.run,     f.run,     fb.run),
+        deploy:  merge_defines_map(d.deploy,  db.deploy,  f.deploy,  fb.deploy),
+      )
+    end
+
+    def self.effective_bt_config(flavor_bts, default_bts, build_type)
+      f = (flavor_bts  || {})[build_type]
+      d = (default_bts || {})[build_type]
+      BuildTypeConfig.new(
+        id_suffix:   effective_build_type_suffix(f&.id_suffix,   d&.id_suffix),
+        name_suffix: effective_build_type_suffix(f&.name_suffix, d&.name_suffix),
+        firebase:    merge_firebase_config(f&.firebase, d&.firebase),
+        auth:        merge_auth_config(f&.auth, d&.auth),
+      )
+    end
+
+    # Full 4-level cascade for every firebase field (most specific wins):
+    #   L1: flavor_bt   — flavor.build_types[bt].firebase
+    #   L2: flavor_top  — flavor.firebase
+    #   L3: default_bt  — default.build_types[bt].firebase
+    #   L4: default_top — defaults.firebase
+    def self.resolve_firebase(flavor_bt, flavor_top, default_bt, default_top)
+      project_id = flavor_bt&.project_id ||
+                   flavor_top&.project_id ||
+                   default_bt&.project_id ||
+                   default_top&.project_id
+      config_file = flavor_bt&.config_file ||
+                    flavor_top&.config_file ||
+                    default_bt&.config_file ||
+                    default_top&.config_file
+      sa = flavor_bt&.service_account ||
+           flavor_top&.service_account ||
+           default_bt&.service_account ||
+           default_top&.service_account
+      target = flavor_bt&.target ||
+               flavor_top&.target ||
+               default_bt&.target ||
+               default_top&.target
+      return nil if project_id.nil? && config_file.nil? && sa.nil? && target.nil?
+      FirebaseConfig.new(
+        project_id:      project_id,
+        config_file:     config_file,
+        service_account: sa,
+        target:          target,
+      )
+    end
+
+    def self.merge_firebase_config(flavor, default)
+      return default if flavor.nil?
+      return flavor  if default.nil?
+      # service_account cascades independently — a flavor can override project_id without having to
+      # repeat the service_account key, and vice versa.
+      FirebaseConfig.new(
+        project_id:      flavor.project_id      || default.project_id,
+        config_file:     flavor.config_file     || default.config_file,
+        service_account: flavor.service_account || default.service_account,
+        target:          flavor.target          || default.target,
+      )
+    end
+
+    def self.merge_auth_config(flavor, default)
+      return default if flavor.nil?
+      return flavor  if default.nil?
+      AuthConfig.new(
+        client_id:          flavor.client_id          || default.client_id,
+        reversed_client_id: flavor.reversed_client_id || default.reversed_client_id,
+        others:             (default.others || {}).merge(flavor.others || {}),
+      )
+    end
+  end
+end

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

@@ -0,0 +1,136 @@
+require_relative 'model'
+
+module AnnFlavorCore
+  #
+  # Opt-in unknown-key detection for annspec.yaml.
+  #
+  # Per-level VALID KEYS are derived automatically from each Struct's +members+ (Ruby's
+  # built-in reflection for Struct.new(...)-defined classes) -- this part can never
+  # drift out of sync with the model, the same way Kotlin's reflection-based checker
+  # can't. Ruby has no static typing, so which nested Struct class a field recurses
+  # into cannot be derived by reflection alone; RECURSION_TARGETS is the one small,
+  # explicit map needed for that -- it is a target-class lookup, not a key list, so it
+  # stays small (~20 entries) and stable even as fields are added to existing structs.
+  #
+  # Does NOT modify AnnFlavorCore::Parser in any way -- a fully separate, additive pass
+  # over the same raw Hash the parser already receives.
+  #
+  # Usage: AnnFlavorCore::StrictModeChecker.check(raw_hash, AnnFlavorCore::AnnSpec)
+  #
+  module StrictModeChecker
+    # 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.
+    FREE_FORM_FIELDS = %i[custom dart_defines].freeze
+
+    # (containing_struct, field_name) => target_struct — only the "does this field
+    # recurse, and into what" relationship; the valid-keys-within-that-struct question
+    # is still fully derived from Struct#members.
+    RECURSION_TARGETS = {
+      [AnnSpec, :app]                => AnnApp,
+      [AnnSpec, :tooling]            => ToolingConfig,
+      [AnnApp, :android]             => AndroidPlatform,
+      [AnnApp, :ios]                 => IosPlatform,
+      [AnnApp, :web]                 => WebPlatform,
+      [AnnApp, :windows]             => WindowsPlatform,
+      [AnnApp, :integrations]        => AnnIntegrations,
+
+      [AndroidPlatform, :default]    => AndroidDefault,
+      [AndroidPlatform, :flavors]    => AndroidFlavor, # via `flavor:` YAML key, map values
+      [IosPlatform, :default]        => IosDefault,
+      [IosPlatform, :flavors]        => IosFlavor,
+      [WebPlatform, :default]        => WebDefault,
+      [WebPlatform, :flavors]        => WebFlavor,
+      [WindowsPlatform, :default]    => WindowsDefault,
+      [WindowsPlatform, :flavors]    => WindowsFlavor,
+
+      [AndroidDefault, :admob]       => AdmobConfig,
+      [AndroidDefault, :sdk]         => AndroidSdk,
+      [AndroidDefault, :credentials] => AndroidCredentials,
+      [AndroidDefault, :firebase]    => FirebaseConfig,
+      [AndroidDefault, :build_types] => BuildTypeConfig, # map values
+      [AndroidFlavor, :admob]        => AdmobConfig,
+      [AndroidFlavor, :credentials]  => AndroidCredentials,
+      [AndroidFlavor, :firebase]     => FirebaseConfig,
+      [AndroidFlavor, :stores]       => FlavorStores,
+      [AndroidFlavor, :build_types]  => BuildTypeConfig,
+
+      [IosDefault, :admob]           => AdmobConfig,
+      [IosDefault, :credentials]     => IosCredentials,
+      [IosDefault, :firebase]        => FirebaseConfig,
+      [IosDefault, :build_types]     => BuildTypeConfig,
+      [IosFlavor, :admob]            => AdmobConfig,
+      [IosFlavor, :credentials]      => IosCredentials,
+      [IosFlavor, :firebase]         => FirebaseConfig,
+      [IosFlavor, :stores]           => FlavorStores,
+      [IosFlavor, :build_types]      => BuildTypeConfig,
+
+      [WebDefault, :cloudflare]      => CloudflareConfig,
+      [WebDefault, :build_types]     => BuildTypeConfig,
+      [WebFlavor, :cloudflare]       => CloudflareConfig,
+      [WebFlavor, :build_types]      => BuildTypeConfig,
+
+      [WindowsDefault, :build_types] => BuildTypeConfig,
+      [WindowsFlavor, :build_types]  => BuildTypeConfig,
+
+      [BuildTypeConfig, :admob]      => AdmobConfig,
+      [BuildTypeConfig, :firebase]   => FirebaseConfig,
+      [BuildTypeConfig, :auth]       => AuthConfig,
+
+      [AndroidCredentials, :signing]        => AndroidSigning,
+      [AndroidCredentials, :google_play]    => GooglePlayCredentials,
+      [AndroidCredentials, :samsung_galaxy] => SamsungGalaxyCredentials,
+      [AndroidCredentials, :amazon]         => AmazonCredentials,
+      [IosCredentials, :signing]            => IosSigning,
+      [IosCredentials, :app_store]          => AppStoreCredentials,
+
+      [FlavorStores, :google_play]   => GooglePlayFlavorStore,
+      [FlavorStores, :samsung_galaxy] => SamsungGalaxyFlavorStore,
+      [FlavorStores, :amazon]        => AmazonFlavorStore,
+      [FlavorStores, :app_store]     => AppStoreFlavorStore,
+    }.freeze
+
+    # Fields whose target struct's instances live inside a Hash keyed by an arbitrary
+    # user-chosen name (flavor name, build-type name), not a single nested Hash.
+    MAP_VALUED_FIELDS = %i[flavors build_types].freeze
+
+    def self.check(raw, root_struct)
+      issues = []
+      walk(raw, root_struct, '', issues)
+      issues
+    end
+
+    def self.walk(raw, struct_class, path, issues)
+      return unless raw.is_a?(Hash)
+
+      valid_keys = struct_class.members.map(&:to_s)
+      # `flavors` (Struct member) reads YAML key `flavor` (singular) -- the one
+      # deliberate field-name <-> YAML-key exception in the schema.
+      valid_keys = valid_keys.map { |k| k == 'flavors' ? 'flavor' : k }
+
+      raw.each do |raw_key, raw_value|
+        key = raw_key.to_s
+        field_path = path.empty? ? key : "#{path}.#{key}"
+
+        unless valid_keys.include?(key)
+          context = path.empty? ? 'top-level annspec.yaml' : "#{path} block"
+          issues << "Unknown field \"#{key}\" in #{context}. Check for typos or remove the field."
+          next
+        end
+
+        field_sym = (key == 'flavor' ? 'flavors' : key).to_sym
+        next if FREE_FORM_FIELDS.include?(field_sym)
+
+        target_struct = RECURSION_TARGETS[[struct_class, field_sym]]
+        next unless target_struct
+
+        if MAP_VALUED_FIELDS.include?(field_sym)
+          raw_value.is_a?(Hash) && raw_value.each_value do |entry_val|
+            walk(entry_val, target_struct, field_path, issues)
+          end
+        else
+          walk(raw_value, target_struct, field_path, issues)
+        end
+      end
+    end
+  end
+end

data/lib/vendor/ann_flavor_core/lib/ann_flavor_core/version.rb

@@ -0,0 +1,3 @@
+module AnnFlavorCore
+  VERSION = '1.0.0'
+end

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

@@ -0,0 +1,6 @@
+require_relative 'ann_flavor_core/version'
+require_relative 'ann_flavor_core/model'
+require_relative 'ann_flavor_core/parser'
+require_relative 'ann_flavor_core/resolver'
+require_relative 'ann_flavor_core/ios_resolution'
+require_relative 'ann_flavor_core/strict_mode_checker'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-flutter
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - ANN Solutions
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -66,7 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description:
 email:
 - support@annaibrands.com
 executables: []
@@ -102,12 +100,18 @@ files:
 - lib/fastlane/plugin/ann_flavor_flutter/helper/utils_project_config.rb
 - lib/fastlane/plugin/ann_flavor_flutter/helper/utils_spec_loader.rb
 - lib/fastlane/plugin/ann_flavor_flutter/helper/utils_status.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/ios_resolution.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/model.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/parser.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/resolver.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/strict_mode_checker.rb
+- lib/vendor/ann_flavor_core/lib/ann_flavor_core/version.rb
 - plugin_manager.sh
 homepage: https://github.com/anntech-dev
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A fastlane plugin to manage Flutter build flavors and shared setup.
 test_files: []