ann-flavor-flutter 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70549206a408d933bf2258bf1c8b21ba4b1439d926e106a67f08564a2eac3fe
-  data.tar.gz: 0ff6ede39627802182e5ace0a13ab8d5a48075539f65827a52dbd9bfcc838373
+  metadata.gz: 447122ad8d1119d28bf0aa610fbdaca4c59ef0c4049fd61f6e7020df8d69423a
+  data.tar.gz: dbd5b81ae7e31e7c866c50487d34ba891bf74666a91d74652d0e6ac7273f5242
 SHA512:
-  metadata.gz: d3d91d71d2a5321d94b3211cc0818430a4525ef5fb65ca8d80e9cad5c2471f111556aee73452a6265179f4569e591c2f79661024c0959ead917b94115f1a445a
-  data.tar.gz: 6e90f40ea8ea0736b6984c30389916cbbe395116b7efdb4defde155da342174c0c62cec528c726fd698f9f6715d6821b67020518acb1a5db58d755e4b765c729
+  metadata.gz: 5bb57612673800eab64900e93aefde7faac4a27d78b898cd3e080c872b68e893393dd4180b791f9260434bb5d0369bff7e6df3ebf529cf5d7165cdd75ca8a63d
+  data.tar.gz: 0d4aba9d47ab1061a2dedd1bd874fab7797d0591d9efc3b8a951f1c45f530e1c56c8793c046af0f04af396cd4d677cbc75468d71ff175ac6b08cf6847928a185

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.10
+
+### Fixed
+- `AnnFlavorCore::AnnSpec#flavor_exists_on?(platform_key, flavor_key)` added to the shared core (`ann-flavor-core-ruby`, vendored into this gem at publish time). Core-only in this release — `YamlSpecLoader`/`PodspecBridge` do not call this method yet; no functional change to Fastlane lane behavior. Included here purely because this gem vendors the shared core's source and versions travel together.
+
+## 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

data/lib/ann_flavor_flutter/version.rb

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

@@ -13,6 +13,25 @@ module AnnFlavorCore
 
   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)
+
+    # Whether flavor +flavor_key+ has an entry under app.<platform_key>.flavor
+    # in the spec — i.e. whether this flavor actually targets that platform.
+    #
+    # +platform_key+ is 'android', 'ios', 'web', or 'windows' (any other
+    # value returns false). This says nothing about whether the platform
+    # itself is configured for the app at all — a platform absent from app
+    # entirely also returns false here, the same as a platform that exists
+    # but doesn't list this flavor. Callers that need to distinguish those
+    # two cases should check app.<platform_key>.nil? separately.
+    def flavor_exists_on?(platform_key, flavor_key)
+      platform = case platform_key
+                 when 'android' then app&.android
+                 when 'ios'     then app&.ios
+                 when 'web'     then app&.web
+                 when 'windows' then app&.windows
+                 end
+      platform&.flavors&.key?(flavor_key) || false
+    end
   end
 
   AnnApp = Struct.new(:android, :ios, :web, :windows, :general, :integrations, keyword_init: true)

metadata

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