ann-flavor-flutter 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2884061122825135d9f07bb18db889d23509649848aca1fca2c45b63b9b8c3bd
-  data.tar.gz: 5ed44c51bcf6c29195763aaa2615f4bb59b71a5b0908f26fdbc83677419273a4
+  metadata.gz: a70549206a408d933bf2258bf1c8b21ba4b1439d926e106a67f08564a2eac3fe
+  data.tar.gz: 0ff6ede39627802182e5ace0a13ab8d5a48075539f65827a52dbd9bfcc838373
 SHA512:
-  metadata.gz: 8635f03da486e2aa4da6a7c9ed423d76260624ff5710a58c4a174951ecf2922bd874e4ff197edcb551db650ae7ef3fc76725d4f58935a076785f0c3f203e3a81
-  data.tar.gz: 0e5a13e1e4c03ddf24b31bb7b7c07fd330934213601b7a373408fdb051b8cfb2bb0bf298a9ad254df1ede039315b4871f6b2ff44a90818c7574a7361f2f197b6
+  metadata.gz: d3d91d71d2a5321d94b3211cc0818430a4525ef5fb65ca8d80e9cad5c2471f111556aee73452a6265179f4569e591c2f79661024c0959ead917b94115f1a445a
+  data.tar.gz: 6e90f40ea8ea0736b6984c30389916cbbe395116b7efdb4defde155da342174c0c62cec528c726fd698f9f6715d6821b67020518acb1a5db58d755e4b765c729

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 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
+- `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

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.4.6"
+  VERSION = "0.4.8"
 end

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/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.6
+  version: 0.4.8
 platform: ruby
 authors:
 - ANN Solutions