fastlane-plugin-firebase_app_distribution 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b85c6c60b76c751c0f4f5ca2611bd6735b5540b1525e600dad266b354bcc2e7
-  data.tar.gz: dbee1fc079ed0d7c8f1b50aec4cc22339e7046cf97b100576564797afa440e48
+  metadata.gz: 789a32fce54326215942dfb99d0bb843887a36d84ca3ecfc474d4408b02c103d
+  data.tar.gz: f2d3b26d638efddc8920e9df5b01bbb4efa176e26d91a33cb8ab781b2996ac11
 SHA512:
-  metadata.gz: 5fd6c96184db82f9d38dc5495b2c8adcd9b42326f45420afcf50b9db66064dd7c07228d694d349b0c1ee3e82782cc8fe76ec5e0889841574f3c12ecaeff89362
-  data.tar.gz: 3f5e0aafc6c0b09ae3722f7fd65522009470c70cad2bd115fd061f2c38a63522eec6b77aa036df9e21cc30b6704134fe593ec132dee5026e65a50d29366f4d91
+  metadata.gz: 72c6db99756504fc29a2e5ef24baf600a5bb13ddb3758385b240876fc5d3cf891c5c9bdc7037400aa3272d5aefe1fd2cdb2f2ea677b0dfa12f9fab78636012d3
+  data.tar.gz: d8a9c0d7ffc1d44813d8f97944d3db5dc3d3bf0eedfb4af3f89d4353d4bb3483a7ce4e7ae39bd502f1a302cc2ac94572ddee07842974644bbff0e9d02cf25cec

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb

@@ -142,34 +142,6 @@ module Fastlane
         test_password && test_password.sub(/\r?\n$/, "")
       end
 
-      def self.app_id_from_params(params)
-        if params[:app]
-          app_id = params[:app]
-        elsif xcode_archive_path
-          plist_path = params[:googleservice_info_plist_path]
-          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
-        end
-        if app_id.nil?
-          UI.crash!(ErrorMessage::MISSING_APP_ID)
-        end
-        app_id
-      end
-
-      def self.xcode_archive_path
-        # prevents issues on cross-platform build environments where an XCode build happens within
-        # the same lane
-        return nil if lane_platform == :android
-
-        # rubocop:disable Require/MissingRequireStatement
-        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
-        # rubocop:enable Require/MissingRequireStatement
-      end
-
-      def self.lane_platform
-        # to_sym shouldn't be necessary, but possibly fixes #376
-        Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]&.to_sym
-      end
-
       def self.platform_from_app_id(app_id)
         if app_id.include?(':ios:')
           :ios
@@ -492,7 +464,7 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
                                        env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
-                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path (or directly, if no archived product path is found)",
                                        default_value: "GoogleService-Info.plist",
                                        optional: true,
                                        type: String),

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_get_latest_release.rb

@@ -19,15 +19,15 @@ module Fastlane
         client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
         client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
-        UI.message("⏳ Fetching latest release for app #{params[:app]}...")
-
-        parent = app_name_from_app_id(params[:app])
+        app_id = app_id_from_params(params)
+        UI.message("⏳ Fetching latest release for app #{app_id}...")
+        parent = app_name_from_app_id(app_id)
 
         begin
           releases = client.list_project_app_releases(parent, page_size: 1).releases
         rescue Google::Apis::Error => err
           if err.status_code.to_i == 404
-            UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{params[:app]}")
+            UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
           else
             UI.crash!(err)
           end
@@ -35,7 +35,7 @@ module Fastlane
 
         if releases.nil? || releases.empty?
           latest_release = nil
-          UI.important("No releases for app #{params[:app]} found in App Distribution. Returning nil and setting Actions.lane_context[SharedValues::FIREBASE_APP_DISTRO_LATEST_RELEASE].")
+          UI.important("No releases for app #{app_id} found in App Distribution. Returning nil and setting Actions.lane_context[SharedValues::FIREBASE_APP_DISTRO_LATEST_RELEASE].")
         else
           # latest_release = append_json_style_fields(response.releases[0].to_h)
           latest_release = map_release_hash(releases[0])
@@ -80,10 +80,19 @@ module Fastlane
 
       def self.available_options
         [
+          # iOS Specific
+          FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
+                                       env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the archived product path (or directly, if no archived product path is found)",
+                                       default_value: "GoogleService-Info.plist",
+                                       optional: true,
+                                       type: String),
+
+          # General
           FastlaneCore::ConfigItem.new(key: :app,
                                        env_name: "FIREBASEAPPDISTRO_APP",
                                        description: "Your app's Firebase App ID. You can find the App ID in the Firebase console, on the General Settings page",
-                                       optional: false,
+                                       optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using Firebase CLI's login:ci command",

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb

@@ -1,3 +1,4 @@
+require 'fastlane/action'
 require 'fastlane_core/ui/ui'
 require 'cfpropertylist'
 require 'google/apis/core'
@@ -36,15 +37,52 @@ module Fastlane
         string.strip.split(delimiter).map(&:strip)
       end
 
+      def app_id_from_params(params)
+        plist_path = params[:googleservice_info_plist_path]
+        if params[:app]
+          UI.message("Using app ID from 'app' parameter")
+          app_id = params[:app]
+        elsif xcode_archive_path
+          UI.message("Using app ID from the GoogleService-Info.plist file located using the 'googleservice_info_plist_path' parameter, relative to the archive path: #{xcode_archive_path}")
+          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
+        elsif plist_path
+          UI.message("Using app ID from the GoogleService-Info.plist file located using the 'googleservice_info_plist_path' parameter directly since no archive path was found")
+          app_id = get_ios_app_id_from_plist(plist_path)
+        end
+        if app_id.nil?
+          UI.crash!(ErrorMessage::MISSING_APP_ID)
+        end
+        app_id
+      end
+
+      def lane_platform
+        # to_sym shouldn't be necessary, but possibly fixes #376
+        Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]&.to_sym
+      end
+
+      def xcode_archive_path
+        # prevents issues on cross-platform build environments where an XCode build happens within
+        # the same lane
+        return nil if lane_platform == :android
+
+        # rubocop:disable Require/MissingRequireStatement
+        Actions.lane_context[Actions::SharedValues::XCODEBUILD_ARCHIVE]
+        # rubocop:enable Require/MissingRequireStatement
+      end
+
       def parse_plist(path)
         CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
       end
 
-      def get_ios_app_id_from_archive_plist(archive_path, plist_path)
+      def get_ios_app_id_from_archive_plist(archive_path, relative_plist_path)
         app_path = parse_plist("#{archive_path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
         UI.shell_error!("can't extract application path from Info.plist at #{archive_path}") if app_path.empty?
-        identifier = parse_plist("#{archive_path}/Products/#{app_path}/#{plist_path}")["GOOGLE_APP_ID"]
-        UI.shell_error!("can't extract GOOGLE_APP_ID") if identifier.empty?
+        return get_ios_app_id_from_plist("#{archive_path}/Products/#{app_path}/#{relative_plist_path}")
+      end
+
+      def get_ios_app_id_from_plist(plist_path)
+        identifier = parse_plist(plist_path)["GOOGLE_APP_ID"]
+        UI.shell_error!("can't extract GOOGLE_APP_ID from #{plist_path}") if identifier.empty?
         return identifier
       end
 

data/lib/fastlane/plugin/firebase_app_distribution/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 - Alonso Salas Infante
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-firebaseappdistribution_v1