ann-flavor-flutter 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7cce396ef86ea1e15205e7440d3755a79707eeaa55126a84bce553d0785add
-  data.tar.gz: 10d3037745026703bcd2ae17d93ea6467fb8fe3b6d0962f228b23f2d25e4e7cc
+  metadata.gz: 148c47a3d06aabc1cf846252061bb38bbb0cbd67e27048bd04cfdb9a059b399e
+  data.tar.gz: 39cf77d42b97848a64a19f5ebfb8c995df92b37132995f7c60b7bbcc7fbae3c0
 SHA512:
-  metadata.gz: b3312b0e1231f50e7c99bb0ea43580245bd5bae4814dfd63d790e29fa41f9bc197f5492dcb3e0f9b120ac95e8cbbd4c27666874ed0abc18caf8b0183d0013a26
-  data.tar.gz: 174e5a6e6a016a6772ad6d764056b4576e09279f03130a0e91e36e323d4f0bb3f9b6dc4db825d3405a3feeefc034bfe1f42c8dbf7b1cdd5217f0a13bc1eb8308
+  metadata.gz: 8cd05ae6c3b175a9fa68efa35ed3504a46667e7a85c9a36962e748d727fc0fb5d362e3fe0d2c8df2ab1ca59ca6e7c28f39f97f8390c8bcbf32d51f58bd6c5b41
+  data.tar.gz: 1322abdd31694ff5118a6c222604a75a1359ca98eb3724c316b59a680b561152886f513216c293e5f43755a16c09f10c936605de8a40f3ffc8a9e83f21e40495

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.9
+
+### Fixed
+- `YamlSpecLoader#get_display_name`/`#get_version_name`/`#get_version_code`/`#get_gms_ads_id` were hardcoded to resolve against the `release` build type regardless of the caller's actual build — a sibling of the `#get_package_id` bug fixed under plan-030 Phase 6 / REQ-CDEL-00070, but not applied to these four getters at the time. `PodspecBridge` now threads its real `@build_type` through to all of them (matching `#bundle_id`), so a debug build correctly picks up any `build_types.debug`-level `name_suffix`/`version_name`/`version_code` override instead of silently resolving the release value.
+
+## 0.4.8
+
+### Added
+- `info_plist` schema field added to the shared core (`ann-flavor-core-ruby`, vendored into this plugin) — a new iOS-only field for raw `Info.plist` overrides, valid at `default`/`flavor`/`build_type` levels, as either an inline map or a file-path reference. Core-only in this release — no Fastlane lane or helper reads this field yet. Included here purely because this plugin vendors the shared core and versions travel together.
+
 ## 0.4.7
 
 ### Fixed

data/lib/ann_flavor_flutter/version.rb

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

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

@@ -114,7 +114,7 @@ module FastlaneFlutterFlavor
     end
 
     def display_name
-      @loader.get_display_name(@platform, @flavor)
+      @loader.get_display_name(@platform, @flavor, @build_type)
     end
 
     def bundle_id
@@ -122,15 +122,15 @@ module FastlaneFlutterFlavor
     end
 
     def version_name
-      @loader.get_version_name(@platform, @flavor)
+      @loader.get_version_name(@platform, @flavor, @build_type)
     end
 
     def version_code
-      @loader.get_version_code(@platform, @flavor)
+      @loader.get_version_code(@platform, @flavor, @build_type)
     end
 
     def gms_ads_id
-      @loader.get_gms_ads_id(@platform, @flavor)
+      @loader.get_gms_ads_id(@platform, @flavor, @build_type)
     end
 
     def team_id

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

@@ -179,21 +179,27 @@ module FastlaneFlutterFlavor
       resolved&.effective_id
     end
 
-    # @return [String, nil] The merged app name.
-    def get_display_name(platform, flavor_name)
-      resolved = resolve(platform, flavor_name, 'release')
+    # @return [String, nil] The merged app name for the given build type. Was
+    #   previously hardcoded to 'release' regardless of the caller's actual
+    #   build — a sibling of the get_package_id fix (plan-030 Phase 6 /
+    #   REQ-CDEL-00070): PodspecBridge#display_name now threads its real
+    #   @build_type through instead of relying on this default.
+    def get_display_name(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
       resolved&.effective_name
     end
 
-    # @return [String, nil] The merged version name.
-    def get_version_name(platform, flavor_name)
-      resolved = resolve(platform, flavor_name, 'release')
+    # @return [String, nil] The merged version name for the given build type.
+    #   Was previously hardcoded to 'release' — see get_display_name.
+    def get_version_name(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
       resolved&.effective_version_name
     end
 
-    # @return [String, nil] The path to the version_code.
-    def get_version_code(platform, flavor_name)
-      resolved = resolve(platform, flavor_name, 'release')
+    # @return [String, nil] The version_code for the given build type. Was
+    #   previously hardcoded to 'release' — see get_display_name.
+    def get_version_code(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
       return nil unless resolved
       resolved.effective_version_code.to_i.to_s
     end
@@ -295,8 +301,9 @@ module FastlaneFlutterFlavor
       resolved&.effective_name
     end
 
-    def get_gms_ads_id(platform, flavor_name)
-      resolved = resolve(platform, flavor_name, 'release')
+    # Was previously hardcoded to 'release' — see get_display_name.
+    def get_gms_ads_id(platform, flavor_name, build_type = 'release')
+      resolved = resolve(platform, flavor_name, build_type)
       resolved&.effective_gms_ads_id
     end
 

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

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

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

@@ -162,6 +162,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')),
+        info_plist:   m['info_plist'],
       )
     end
 
@@ -182,6 +183,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')),
+        info_plist:   m['info_plist'],
       )
     end
 
@@ -313,6 +315,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')),
+          info_plist:                 v['info_plist'],
         )
       end
     end

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

@@ -111,6 +111,14 @@ module AnnFlavorCore
         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),
+        # Whole-value most-specific-wins — unlike firebase's per-field merge,
+        # info_plist's value (an arbitrary Hash, or a file-path String) has no
+        # fixed sub-fields to merge independently, so a more specific level's
+        # value replaces a less specific one entirely rather than being merged
+        # key-by-key here (per-key content merging across levels happens later,
+        # 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,
       )
     end
 

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

@@ -20,7 +20,13 @@ module AnnFlavorCore
   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
+    #
+    # 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
 
     # (containing_struct, field_name) => target_struct — only the "does this field
     # recurse, and into what" relationship; the valid-keys-within-that-struct question
@@ -28,6 +34,7 @@ module AnnFlavorCore
     RECURSION_TARGETS = {
       [AnnSpec, :app]                => AnnApp,
       [AnnSpec, :tooling]            => ToolingConfig,
+      [AnnSpec, :debug_config]       => DebugConfig, # via `debug:` YAML key
       [AnnApp, :android]             => AndroidPlatform,
       [AnnApp, :ios]                 => IosPlatform,
       [AnnApp, :web]                 => WebPlatform,
@@ -93,6 +100,40 @@ module AnnFlavorCore
     # user-chosen name (flavor name, build-type name), not a single nested Hash.
     MAP_VALUED_FIELDS = %i[flavors build_types].freeze
 
+    # Deliberate Struct-member <-> YAML-key naming exceptions in the schema -- keys
+    # where the YAML key is NOT simply the snake_case member name, so a fixed,
+    # explicit override is required rather than a growing hand-maintained registry:
+    #
+    # - `flavors` (Struct member) reads YAML key `flavor` (singular).
+    # - Every other entry below is parsed from a literal camelCase YAML key by
+    #   AnnFlavorCore::Parser (unlike the rest of the schema, which is
+    #   snake_case) -- this list was derived by exhaustively scanning every
+    #   string-literal map key the parser reads, not by manual inspection,
+    #   after two rounds of under-scoped fixes (ndk_abi_filters, then
+    #   client_id) missed entries this way. Matches the Dart core's
+    #   hand-written registry and the Kotlin core's equivalent override map,
+    #   both of which already have all of these correct.
+    FIELD_TO_YAML_KEY = {
+      flavors: 'flavor',
+      debug_config: 'debug',
+      client_id: 'clientId',
+      compile_sdk: 'compileSdk',
+      lint_check_release_builds: 'lintCheckReleaseBuilds',
+      min_sdk: 'minSdk',
+      minify_enabled: 'minifyEnabled',
+      ndk_abi_filters: 'ndkAbiFilters',
+      ndk_debug_symbol_level: 'ndkDebugSymbolLevel',
+      ndk_version: 'ndkVersion',
+      print_build_and_flavor_info: 'printBuildAndFlavorInfo',
+      print_debug: 'printDebug',
+      print_release_build_type_info: 'printReleaseBuildTypeInfo',
+      print_sdk_versions: 'printSdkVersions',
+      reversed_client_id: 'reversedClientId',
+      shrink_resources: 'shrinkResources',
+      target_sdk: 'targetSdk',
+    }.freeze
+    YAML_KEY_TO_FIELD = FIELD_TO_YAML_KEY.each_with_object({}) { |(f, y), h| h[y] = f }.freeze
+
     def self.check(raw, root_struct)
       issues = []
       walk(raw, root_struct, '', issues)
@@ -102,10 +143,7 @@ module AnnFlavorCore
     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 }
+      valid_keys = struct_class.members.map { |m| FIELD_TO_YAML_KEY[m] || m.to_s }
 
       raw.each do |raw_key, raw_value|
         key = raw_key.to_s
@@ -117,7 +155,7 @@ module AnnFlavorCore
           next
         end
 
-        field_sym = (key == 'flavor' ? 'flavors' : key).to_sym
+        field_sym = YAML_KEY_TO_FIELD[key] || key.to_sym
         next if FREE_FORM_FIELDS.include?(field_sym)
 
         target_struct = RECURSION_TARGETS[[struct_class, field_sym]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-flutter
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - ANN Solutions