ann-flavor-flutter 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2884061122825135d9f07bb18db889d23509649848aca1fca2c45b63b9b8c3bd
-  data.tar.gz: 5ed44c51bcf6c29195763aaa2615f4bb59b71a5b0908f26fdbc83677419273a4
+  metadata.gz: fd7cce396ef86ea1e15205e7440d3755a79707eeaa55126a84bce553d0785add
+  data.tar.gz: 10d3037745026703bcd2ae17d93ea6467fb8fe3b6d0962f228b23f2d25e4e7cc
 SHA512:
-  metadata.gz: 8635f03da486e2aa4da6a7c9ed423d76260624ff5710a58c4a174951ecf2922bd874e4ff197edcb551db650ae7ef3fc76725d4f58935a076785f0c3f203e3a81
-  data.tar.gz: 0e5a13e1e4c03ddf24b31bb7b7c07fd330934213601b7a373408fdb051b8cfb2bb0bf298a9ad254df1ede039315b4871f6b2ff44a90818c7574a7361f2f197b6
+  metadata.gz: b3312b0e1231f50e7c99bb0ea43580245bd5bae4814dfd63d790e29fa41f9bc197f5492dcb3e0f9b120ac95e8cbbd4c27666874ed0abc18caf8b0183d0013a26
+  data.tar.gz: 174e5a6e6a016a6772ad6d764056b4576e09279f03130a0e91e36e323d4f0bb3f9b6dc4db825d3405a3feeefc034bfe1f42c8dbf7b1cdd5217f0a13bc1eb8308

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 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

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.7
 platform: ruby
 authors:
 - ANN Solutions