ann-flavor-flutter 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815a329fc3fb31c9cec3e8482b5023c68c2951eb73ba10331ac910e3dc1ba0f2
-  data.tar.gz: 32d4865b2b969ba4296609a480608c1bbb68b1e1959c1c2d38084c6d3027136b
+  metadata.gz: 86afd16e35ee819fdc999f688a838a3aac99e1488df8b701926ee696c3a27d94
+  data.tar.gz: 509143d39a25e2923f04f303895ff90e57d6f1967a988ac356e19efcf4453955
 SHA512:
-  metadata.gz: 228523643e49ee2bace67ce3dd706c6411de3d4558d04326dfa9447964c56a5780a0657910345d9392ef999c034dd4ae22264bc4cf90151801d38394e5f830ea
-  data.tar.gz: 168799e6071ec946faf8c77a40cf40e4c04dee8d8b917f2bf0eb6b546af6c74e1cae5bc17a4812107ee852b6af31181cc85f1709c635960faa03d779a9481681
+  metadata.gz: 8480fc1f4ca939e98dcdda2e7a97115be71155fe858addcdcf1df62e85e1ba23fe372356361ad8e7ed47f62bde19ab65096dae78927fefde6952ca17a5f1e27b
+  data.tar.gz: cb8f39ac36485def3ce474e44bbc86e35588f938ee302679aa461a1eb5b3648c201608f2f5f9ce0837a9899d358a7799287afc843d5381bb9032eb0d1d794932

data/lib/ann_flavor_flutter/version.rb

@@ -1,3 +1,3 @@
 module AnnFlavorFlutter
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 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/utils_spec_loader.rb

@@ -71,6 +71,11 @@ module FastlaneFlutterFlavor
       return current_data
     end
 
+    def enabled?
+      return false unless @spec_data
+      @spec_data.fetch('enabled', true) != false
+    end
+
     # Retrieves the configuration for a specific flavor, merged with the platform defaults.
     # This function uses the spec data loaded into the instance variable @spec_data.
     #
@@ -78,7 +83,7 @@ module FastlaneFlutterFlavor
     # @param flavor_name [String] The name of the flavor (e.g., 'dev', 'staging').
     # @return [Hash, nil] The fully merged configuration for the flavor, or nil if missing.
     def get_merged_flavor_config(platform, flavor_name)
-      return nil unless @spec_data # Check if file was loaded successfully
+      return nil unless @spec_data && enabled?
 
       platform_key = platform.to_s
       flavor_key = flavor_name.to_s
@@ -120,7 +125,7 @@ module FastlaneFlutterFlavor
     # @param platform [Symbol] The target platform (:ios or :android).
     # @return [Hash] A hash where keys are flavor names (String) and values are their raw configs (Hash).
     def get_platform_flavors(platform)
-      return {} unless @spec_data
+      return {} unless @spec_data && enabled?
       platform_key = platform.to_s
 
       # Use dig to safely retrieve the flavors hash from @spec_data
@@ -274,49 +279,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.12
+  version: 0.1.14
 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