ann-flavor-flutter 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d7f58e4027292d95f6a258d4ff3c3ac7b26b76c6cfc60c9406af289fa97fdc
-  data.tar.gz: 4027de193deef4a6293fef30bf505fe57412f82255dcc7d036b62c6de28d55d3
+  metadata.gz: cb2b8ab1ad12ea68a12a8a93b557f7c614bc7f219dc48137353d2057f3ecb9d8
+  data.tar.gz: 2b82e97deb90ac3b49f6f158553f23e6e701b1f66d59138e3f4a57ccb0e3745c
 SHA512:
-  metadata.gz: 19f6a97ecde33b1d933bf4ae0e4a0e7016214a04c0f52c9d5940cc0625a04637ad65b0fd87fdf1be848843e20b23bbb110135c41a33b99fb59a04ac07199c26e
-  data.tar.gz: 1972bfc4ba0b631a6551214620d5f94afff4e2d2871ee4229cc9024e60216ec57ce2475e316bc312f733cef12853a54fc4d1fa4b26d71cc39b0f5bf6586fd368
+  metadata.gz: af65440fa998b255208fa86d8111ac53cedfb3fc137d99c91e8ce9939745c6a03cadfadd6b7dd5b1038bf05c80fc5e5b8e7f9119fa736fb4d7fb14f8a212e6f1
+  data.tar.gz: e3023ec10784fbeaa677aa1a141ae03f4779ca29c8ff307f0dc8199aac703f14c8a48df8852c363adb7a7c0b883e73e809952bf220eb1acf5e1cdb7741847a28

data/CHANGELOG.md

@@ -0,0 +1,90 @@
+# Changelog
+
+## 0.2.0
+
+**Hard error on removed fields** — `firebase_app_id` and `build_target` inside any
+iOS `firebase` block in `annspec.yaml` are now hard errors. The plugin raises
+`UI.user_error!` and halts immediately at lane start. Remove both fields from your spec:
+
+- `GOOGLE_APP_ID` is now read automatically from the generated
+  `lib/generated/firebase/{flavor}_{build_type}_ios_firebase_options.dart` file
+  (produced by `dart run ann_flutter_flavor sync`).
+- Xcode build target is derived automatically as `{BuildType}-{flavorKey}`
+  (e.g. `Release-ledger_in`).
+
+**`ANN_GOOGLE_APP_ID` env var fallback** — when the generated firebase options dart
+file is missing (e.g. a fresh CI environment before sync has been run), `GOOGLE_APP_ID`
+falls back to the `ANN_GOOGLE_APP_ID` environment variable. A `UI.important` warning
+is printed to guide you to run sync and remove the dependency.
+
+## 0.1.14
+
+Internal publish-workflow improvements. No user-facing changes.
+
+## 0.1.13
+
+**`enabled: false` support** — if `annspec.yaml` sets `enabled: false`, all lanes
+skip execution silently. Previously the plugin would error on a disabled spec.
+
+**Improved error messages** — field validation errors now include the exact YAML path
+and a fix hint.
+
+## 0.1.12
+
+**Breaking: `annai_app:` root key renamed to `app:`** — `annspec.yaml` files using
+the old `annai_app:` root key must be updated.
+
+## 0.1.11
+
+Internal version bump. No user-facing changes.
+
+## 0.1.10
+
+Internal version bump. No user-facing changes.
+
+## 0.1.9
+
+**Firebase `service_account` support** — `firebase_token_file` is replaced by
+`service_account`. The resolved path is exported as `GOOGLE_APPLICATION_CREDENTIALS`
+before invoking Firebase CLI commands.
+
+**Schema restructure** — `android.sdk` moved under `android.default.sdk`;
+credentials fields reorganised under `credentials.signing`. Existing specs must be
+updated to the new structure.
+
+## 0.1.8
+
+Documentation and sync-workflow updates. No user-facing behaviour changes.
+
+## 0.1.7
+
+**Plugin internals renamed** — internal Ruby module renamed from `ann_flutter_flavor`
+to `ann_flavor_flutter` to match the gem name convention. No API change.
+
+## 0.1.6
+
+**Firebase config refactored** — `path`, `firebase_app_id`, and `build_target` are
+replaced by `config_file` and `project_id`. The plugin now reads `config_file` to
+locate the Google services JSON instead of using the old fields.
+
+## 0.1.5
+
+**`admob.gms_ads_id` cascade fixed** — `get_gms_ads_id` now correctly reads from
+`admob.gms_ads_id` at every cascade level (was silently returning nil for iOS default
+cascade).
+
+**Store fields added** — `samsung_galaxy` and `amazon` store IDs are now parsed and
+accessible via `YamlSpecLoader`.
+
+## 0.1.4
+
+**`integrations.fastlane` gate** — the plugin checks `integrations.fastlane: true`
+before running. Specs without this flag skip all Fastlane execution.
+
+## 0.1.3
+
+Internal publish pipeline improvements. No user-facing behaviour changes.
+
+## 0.1.2
+
+Initial release.

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.1.13"
+  VERSION = "0.2.0"
 end

data/lib/fastlane/plugin/ann_flavor_flutter/actions/ann_upload_to_firebase_action.rb

@@ -94,7 +94,6 @@ module Fastlane
               skip_compile: params[:skip_compile],
               skip_sound_null_safety: params[:skip_sound_null_safety],
               firebase_project: params[:firebase_project],
-              firebase_token: params[:firebase_token] || ENV["FIREBASE_TOKEN"],
             )
 
             if success
@@ -151,11 +150,6 @@ module Fastlane
                                        default_value: false),
 
           # --- Web / Firebase Specific Parameters ---
-          FastlaneCore::ConfigItem.new(key: :firebase_token,
-                                       description: "Firebase CLI CI token for authentication (generated via 'firebase login:ci')",
-                                       optional: true,
-                                       env_name: "FIREBASE_TOKEN",
-                                       type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_project,
                                        description: "The Firebase Project ID to deploy to. This value overrides the 'project_id' in the annai spec file",
                                        optional: true,

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

@@ -162,7 +162,7 @@ module FastlaneFlutterFlavor
     # New method to compile web build and deploy to Firebase Hosting
     def upload_to_firebase(flavor: "", main_file: "lib/main.dart", build_config: "release",
                            skip_compile: false, skip_sound_null_safety: false,
-                           firebase_project:, firebase_token:) # firebase_project is the user override
+                           firebase_project:)
 
       begin
         unless @isWeb
@@ -216,12 +216,14 @@ module FastlaneFlutterFlavor
         # 5. Write the updated firebase.json back to disk
         File.write(firebase_config_path, JSON.pretty_generate(config))
 
-        token = firebase_token.to_s.strip
-        if token.empty?
-          token = @specLoader.get_firebase_token_from_properties.to_s.strip
-          unless token.empty?
-            Fastlane::UI.message("Successfully retrieved Firebase token from external properties file.")
-          end
+        # Resolve service account for ADC auth — set GOOGLE_APPLICATION_CREDENTIALS if found
+        sa_path = @specLoader.get_service_account(@platform, flavor, build_config)
+        env_overrides = {}
+        if sa_path && File.exist?(sa_path)
+          env_overrides['GOOGLE_APPLICATION_CREDENTIALS'] = sa_path
+          Fastlane::UI.message("Using service account for Firebase auth: #{sa_path}")
+        elsif sa_path
+          Fastlane::UI.error("service_account file not found at: #{sa_path}")
         end
 
         # 6. Deploy to Firebase Hosting using the determined ID
@@ -230,17 +232,15 @@ module FastlaneFlutterFlavor
           "--only", "hosting",
           "--project", final_project_id,
         ]
-        # Only add the token flags if token is present
-        if !token.empty?
-          command_parts.push("--token", token)
-        end
 
         firebase_root = @root_folder
 
         Fastlane::UI.message("Executing Firebase deploy command: #{command_parts.join(' ')}")
 
         Dir.chdir firebase_root do
+          env_overrides.each { |k, v| ENV[k] = v }
           Fastlane::Actions::sh(*command_parts)
+          env_overrides.keys.each { |k| ENV.delete(k) }
         end
 
         @statusManager.logSuccess flavor, "upload_to_firebase", @platform

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

@@ -32,7 +32,7 @@ module FastlaneFlutterFlavor
       end
 
       loader = YamlSpecLoader.new(root, spec_file)
-      self.new(loader, flavor, config_name)
+      self.new(loader, flavor, root, config_name)
     end
 
     # Injects YAML values into the Xcode Project Build Settings
@@ -87,9 +87,10 @@ module FastlaneFlutterFlavor
       puts "[Annai] Successfully injected flavor '#{log_flavor}' settings into Xcode configurations."
     end
 
-    def initialize(loader, flavor, config_name = nil)
+    def initialize(loader, flavor, project_root, config_name = nil)
       @loader = loader
       @flavor = flavor
+      @project_root = project_root
       @platform = :ios
 
       # BUILD TYPE DETECTION: Prioritize Flutter CLI mode, fallback to config name regex
@@ -145,9 +146,32 @@ module FastlaneFlutterFlavor
     end
 
     def google_app_id
-      # Manual lookup for nested Firebase IDs (using build_type for debug/release)
-      config = @loader.get_merged_flavor_config(@platform, @flavor)
-      config.dig('firebase', @build_type, 'firebase_app_id') || ''
+      # Primary: read appId from the generated firebase_options dart file.
+      # File is generated by `dart run ann_flutter_flavor sync` and committed to the repo.
+      dart_file = File.join(
+        @project_root,
+        "lib/generated/firebase/#{@flavor}_#{@build_type}_ios_firebase_options.dart"
+      )
+      if File.exist?(dart_file)
+        content = File.read(dart_file)
+        match = content.match(/appId:\s*'([^']+)'/) ||
+                content.match(/appId:\s*"([^"]+)"/)
+        return match[1] if match
+      end
+
+      # Fallback: ANN_GOOGLE_APP_ID env var — use when the dart file is missing
+      # (e.g. fresh CI environment before sync has been run).
+      env_value = ENV['ANN_GOOGLE_APP_ID']
+      if env_value && !env_value.empty?
+        Fastlane::UI.important(
+          "[Annai] GOOGLE_APP_ID read from ANN_GOOGLE_APP_ID env var for " \
+          "#{@flavor}/#{@build_type}. Run 'dart run ann_flutter_flavor sync' " \
+          "to generate the source file and remove this dependency."
+        )
+        return env_value
+      end
+
+      ''
     end
   end
 end

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

@@ -30,7 +30,12 @@ module FastlaneFlutterFlavor
         unless yaml_content.is_a?(Hash)
           raise "YAML content must be a top-level Hash."
         end
+
+        check_removed_firebase_fields(yaml_content)
+
         return yaml_content
+      rescue Fastlane::Shell::ShellError => e
+        raise e
       rescue => e
         # Use @file_path for reporting the error path
         Fastlane::UI.error("Failed to load or parse annai spec YAML file at #{@file_path}: #{e.message}")
@@ -38,6 +43,45 @@ module FastlaneFlutterFlavor
       end
     end
 
+    # Raises UI.user_error! if firebase_app_id or build_target are present in any iOS firebase block.
+    # Both fields were removed — they are derived automatically now.
+    def check_removed_firebase_fields(spec_data)
+      ios_app = spec_data.dig('app', 'ios')
+      return unless ios_app.is_a?(Hash)
+
+      sections = {}
+      sections['ios.default'] = ios_app.dig('default') || {}
+
+      flavors = ios_app.dig('flavor') || {}
+      flavors.each do |flavor_key, flavor_data|
+        sections["ios.flavor.#{flavor_key}"] = flavor_data || {}
+      end
+
+      sections.each do |section_path, section_data|
+        build_types = section_data.dig('build_types') || {}
+        build_types.each do |bt_key, bt_data|
+          next unless bt_data.is_a?(Hash)
+          firebase_block = bt_data.dig('firebase') || {}
+          next unless firebase_block.is_a?(Hash)
+
+          if firebase_block.key?('firebase_app_id')
+            Fastlane::UI.user_error!(
+              "[#{section_path}/#{bt_key}] `firebase_app_id` is no longer supported in annspec.yaml. " \
+              "Remove it — GOOGLE_APP_ID is now read from the generated firebase_options dart file."
+            )
+          end
+
+          if firebase_block.key?('build_target')
+            Fastlane::UI.user_error!(
+              "[#{section_path}/#{bt_key}] `build_target` is no longer supported in annspec.yaml. " \
+              "Remove it — the Xcode build target is derived automatically as " \
+              "'#{bt_key.to_s.capitalize}-#{section_path.split('.').last}'."
+            )
+          end
+        end
+      end
+    end
+
     # Recursively merges defaults into a flavor's data.
     # This function prioritizes 'current_data' (the flavor-specific value).
     # If a key is present in 'default_data' but missing in 'current_data',
@@ -279,49 +323,25 @@ module FastlaneFlutterFlavor
       config.dig('build_types', build_config, 'firebase', 'project_id') if config
     end
 
-    # Retrieves the firebase token from a external .properties file
-    # as defined in app -> general -> firebase_token_file
-    # @return [String, nil] The token value, or nil if not found/error.
-    def get_firebase_token_from_properties
+    # Returns the resolved service_account path for the given platform/flavor/build_config,
+    # cascading from flavor build_type → default build_type.
+    # @return [String, nil]
+    def get_service_account(platform, flavor_name, build_config)
       return nil unless @spec_data
 
-      # 1. Get the properties file path from the YAML spec
-      # Path: app -> general -> firebase_token_file
-      rel_props_path = @spec_data.dig('app', 'general', 'firebase_token_file')
-
-      if rel_props_path.nil? || rel_props_path.empty?
-        Fastlane::UI.verbose("No 'firebase_token_file' defined in app -> general.")
-        return nil
-      end
+      platform_data = @spec_data.dig('app', platform)
+      return nil unless platform_data
 
-      # 2. Resolve the full path relative to project root
-      full_props_path = File.expand_path(rel_props_path, @root_folder)
+      flavor_data   = platform_data.dig('flavor', flavor_name) || {}
+      default_data  = platform_data['default'] || {}
 
-      unless File.exist?(full_props_path)
-        Fastlane::UI.error("Firebase token file not found at: #{full_props_path}")
-        return nil
-      end
+      flavor_bt_sa  = flavor_data.dig('build_types', build_config, 'firebase', 'service_account')
+      default_bt_sa = default_data.dig('build_types', build_config, 'firebase', 'service_account')
 
-      # 3. Parse the .properties file for FIREBASE_TOKEN
-      begin
-        File.foreach(full_props_path) do |line|
-          # Remove whitespace and skip comments/empty lines
-          line = line.strip
-          next if line.empty? || line.start_with?('#', '!')
-
-          # Match KEY=VALUE (handles both = and : as separators)
-          if line =~ /^\s*FIREBASE_TOKEN\s*[=:]\s*(.*)$/
-            token = $1.strip
-            # Remove optional surrounding quotes if present
-            return token.gsub(/^['"]|['"]$/, '')
-          end
-        end
-      rescue => e
-        Fastlane::UI.error("Error reading properties file at #{rel_props_path}: #{e.message}")
-      end
+      path = flavor_bt_sa || default_bt_sa
+      return nil if path.nil? || path.empty?
 
-      Fastlane::UI.verbose("FIREBASE_TOKEN key not found in #{rel_props_path}")
-      return nil
+      File.expand_path(path, @root_folder)
     end
 
     # For AdMob (annai_ads)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ann-flavor-flutter
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - ANN Solutions
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-27 00:00:00.000000000 Z
+date: 2026-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile