fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -27,11 +27,16 @@ module Fastlane
 
       def self.get_build_number(params)
         # Prompts select team if multiple teams and none specified
-        token = self.api_token(params)
-        if token
-          UI.message("Using App Store Connect API token...")
-          Spaceship::ConnectAPI.token = token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
+          # Username is now optional since addition of App Store Connect API Key
+          # Force asking for username to prompt user if not already set
+          params.fetch(:username, force_ask: true)
+
           UI.message("Login to App Store Connect (#{params[:username]})")
           Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true, tunes_team_id: params[:team_id], team_name: params[:team_name])
           UI.message("Login successful")
@@ -98,13 +103,6 @@ module Fastlane
         versions.map(&:to_s).sort_by { |v| Gem::Version.new(v) }
       end
 
-      def self.api_token(params)
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-        api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-        return api_token
-      end
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -118,7 +116,7 @@ module Fastlane
         user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
         [
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                       env_name: "APPSTORE_BUILD_NUMBER_API_KEY_PATH",
+                                       env_names: ["APPSTORE_BUILD_NUMBER_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
                                        description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                        optional: true,
                                        conflicting_options: [:api_key],
@@ -126,16 +124,18 @@ module Fastlane
                                          UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "APPSTORE_BUILD_NUMBER_API_KEY",
+                                       env_names: ["APPSTORE_BUILD_NUMBER_API_KEY", "APP_STORE_CONNECT_API_KEY"],
                                        description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
                                        type: Hash,
+                                       default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                       default_value_dynamic: true,
                                        optional: true,
                                        sensitive: true,
                                        conflicting_options: [:api_key_path]),
           FastlaneCore::ConfigItem.new(key: :initial_build_number,
                                        env_name: "INITIAL_BUILD_NUMBER",
                                        description: "sets the build number to given value if no build is in current train",
-                                       is_string: false),
+                                       skip_type_validation: true), # as we also allow integers, which we convert to strings anyway
           FastlaneCore::ConfigItem.new(key: :app_identifier,
                                        short_option: "-a",
                                        env_name: "FASTLANE_APP_IDENTIFIER",
@@ -147,6 +147,7 @@ module Fastlane
                                        short_option: "-u",
                                        env_name: "ITUNESCONNECT_USER",
                                        description: "Your Apple ID Username",
+                                       optional: true,
                                        default_value: user,
                                        default_value_dynamic: true),
           FastlaneCore::ConfigItem.new(key: :team_id,
@@ -154,7 +155,7 @@ module Fastlane
                                        env_name: "APPSTORE_BUILD_NUMBER_LIVE_TEAM_ID",
                                        description: "The ID of your App Store Connect team if you're in multiple teams",
                                        optional: true,
-                                       is_string: false, # as we also allow integers, which we convert to strings anyway
+                                       skip_type_validation: true, # as we also allow integers, which we convert to strings anyway
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
                                        default_value_dynamic: true,
@@ -166,7 +167,7 @@ module Fastlane
                                        env_name: "APPSTORE_BUILD_NUMBER_LIVE",
                                        description: "Query the live version (ready-for-sale)",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "LATEST_VERSION",
@@ -177,7 +178,6 @@ module Fastlane
                                        env_name: "APPSTORE_PLATFORM",
                                        description: "The platform to use (optional)",
                                        optional: true,
-                                       is_string: true,
                                        default_value: "ios",
                                        verify_block: proc do |value|
                                          UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include?(value)

data/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'spaceship'
 
 module Fastlane
   module Actions
@@ -29,7 +30,7 @@ module Fastlane
         key = {
           key_id: key_id,
           issuer_id: issuer_id,
-          key: key_content || File.binread(key_filepath),
+          key: key_content || File.binread(File.expand_path(key_filepath)),
           is_key_content_base64: is_key_content_base64,
           duration: duration,
           in_house: in_house
@@ -37,6 +38,10 @@ module Fastlane
 
         Actions.lane_context.set_sensitive(SharedValues::APP_STORE_CONNECT_API_KEY, key)
 
+        # Creates Spaceship API Key session
+        # User does not need to pass the token into any actions because of this
+        Spaceship::ConnectAPI.token = Spaceship::ConnectAPI::Token.create(**key) if options[:set_spaceship_token]
+
         return key
       end
 
@@ -58,7 +63,7 @@ module Fastlane
                                        optional: true,
                                        conflicting_options: [:key_content],
                                        verify_block: proc do |value|
-                                         UI.user_error!("Couldn't find key p8 file at path '#{value}'") unless File.exist?(value)
+                                         UI.user_error!("Couldn't find key p8 file at path '#{value}'") unless File.exist?(File.expand_path(value))
                                        end),
           FastlaneCore::ConfigItem.new(key: :key_content,
                                        env_name: "APP_STORE_CONNECT_API_KEY_KEY",
@@ -75,12 +80,21 @@ module Fastlane
                                        env_name: "APP_STORE_CONNECT_API_KEY_DURATION",
                                        description: "The token session duration",
                                        optional: true,
-                                       type: Integer),
+                                       default_value: Spaceship::ConnectAPI::Token::MAX_TOKEN_DURATION,
+                                       type: Integer,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("The duration can't be more than 1200 (20 minutes) and the value entered was '#{value}'") unless value <= 1200
+                                       end),
           FastlaneCore::ConfigItem.new(key: :in_house,
                                        env_name: "APP_STORE_CONNECT_API_KEY_IN_HOUSE",
-                                       description: "Is App Store or Enterprise (in house) team? App Store Connect API cannot not determine this on its own (yet)",
-                                       optional: true,
-                                       type: Boolean)
+                                       description: "Is App Store or Enterprise (in house) team? App Store Connect API cannot determine this on its own (yet)",
+                                       type: Boolean,
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :set_spaceship_token,
+                                       env_name: "APP_STORE_CONNECT_API_KEY_SET_SPACESHIP_TOKEN",
+                                       description: "Authorizes all Spaceship::ConnectAPI requests by automatically setting Spaceship::ConnectAPI.token",
+                                       type: Boolean,
+                                       default_value: true)
         ]
       end
 
@@ -95,7 +109,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        true
+        [:ios, :mac, :tvos].include?(platform)
       end
 
       def self.details

data/fastlane/lib/fastlane/actions/appaloosa.rb

@@ -10,7 +10,7 @@ module Fastlane
         binary_url = get_binary_link(binary, api_key, store_id, params[:group_ids])
         return if binary_url.nil?
         screenshots_url = get_screenshots_links(api_key, store_id, params[:screenshots], params[:locale], params[:device])
-        upload_on_appaloosa(api_key, store_id, binary_url, screenshots_url, params[:group_ids], params[:description])
+        upload_on_appaloosa(api_key, store_id, binary_url, screenshots_url, params[:group_ids], params[:description], params[:changelog])
       end
 
       def self.get_binary_link(binary, api_key, store_id, group_ids)
@@ -101,7 +101,7 @@ module Fastlane
         end.compact
       end
 
-      def self.upload_on_appaloosa(api_key, store_id, binary_path, screenshots, group_ids, description)
+      def self.upload_on_appaloosa(api_key, store_id, binary_path, screenshots, group_ids, description, changelog)
         screenshots = all_screenshots_links(screenshots)
         uri = URI("#{APPALOOSA_SERVER}/#{store_id}/mobile_application_updates/upload")
         http = Net::HTTP.new(uri.host, uri.port)
@@ -111,6 +111,7 @@ module Fastlane
                      api_key: api_key,
                      mobile_application_update: {
                        description: description,
+                       changelog: changelog,
                        binary_path: binary_path,
                        screenshot1: screenshots[0],
                        screenshot2: screenshots[1],
@@ -218,6 +219,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :description,
                                        env_name: 'FL_APPALOOSA_DESCRIPTION',
                                        description: 'Your app description',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :changelog,
+                                       env_name: 'FL_APPALOOSA_CHANGELOG',
+                                       description: 'Your app changelog',
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/appetize.rb

@@ -31,6 +31,10 @@ module Fastlane
 
         params[:note] = options[:note] if options[:note].to_s.length > 0
 
+        if options[:timeout]
+          params[:timeout] = options[:timeout]
+        end
+
         uri = URI.parse(appetize_url(options))
         req = create_request(uri, params)
         req.basic_auth(options[:api_token], nil)
@@ -105,7 +109,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_host,
                                        env_name: "APPETIZE_API_HOST",
                                        description: "Appetize API host",
-                                       is_string: true,
                                        default_value: 'api.appetize.io',
                                        verify_block: proc do |value|
                                          UI.user_error!("API host should not contain the scheme e.g. `https`") if value.start_with?('https')
@@ -114,29 +117,24 @@ module Fastlane
                                        env_name: "APPETIZE_API_TOKEN",
                                        sensitive: true,
                                        description: "Appetize.io API Token",
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No API Token for Appetize.io given, pass using `api_token: 'token'`") unless value.to_s.length > 0
                                        end),
           FastlaneCore::ConfigItem.new(key: :url,
                                        env_name: "APPETIZE_URL",
                                        description: "URL from which the ipa file can be fetched. Alternative to :path",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :platform,
                                        env_name: "APPETIZE_PLATFORM",
                                        description: "Platform. Either `ios` or `android`",
-                                       is_string: true,
                                        default_value: 'ios'),
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "APPETIZE_FILE_PATH",
                                        description: "Path to zipped build on the local filesystem. Either this or `url` must be specified",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :public_key,
                                        env_name: "APPETIZE_PUBLICKEY",
                                        description: "If not provided, a new app will be created. If provided, the existing build will be overwritten",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          if value.start_with?("private_")
@@ -146,8 +144,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :note,
                                        env_name: "APPETIZE_NOTE",
                                        description: "Notes you wish to add to the uploaded app",
-                                       is_string: true,
-                                       optional: true)
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :timeout,
+                                       env_name: "APPETIZE_TIMEOUT",
+                                       description: "The number of seconds to wait until automatically ending the session due to user inactivity. Must be 30, 60, 90, 120, 180, 300, 600, 1800, 3600 or 7200. Default is 120",
+                                       type: Integer,
+                                       optional: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("The value provided doesn't match any of the supported options.") unless [30, 60, 90, 120, 180, 300, 600, 1800, 3600, 7200].include?(value)
+                                       end)
         ]
       end
 

data/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb

@@ -50,7 +50,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :public_key,
                                        env_name: "APPETIZE_PUBLICKEY",
                                        description: "Public key of the app you wish to update",
-                                       is_string: true,
                                        sensitive: true,
                                        default_value: Actions.lane_context[SharedValues::APPETIZE_PUBLIC_KEY],
                                        default_value_dynamic: true,
@@ -63,18 +62,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :base_url,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_BASE",
                                        description: "Base URL of Appetize service",
-                                       is_string: true,
                                        default_value: "https://appetize.io/embed",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :device,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_DEVICE",
                                        description: "Device type: iphone4s, iphone5s, iphone6, iphone6plus, ipadair, iphone6s, iphone6splus, ipadair2, nexus5, nexus7 or nexus9",
-                                       is_string: true,
                                        default_value: "iphone5s"),
           FastlaneCore::ConfigItem.new(key: :scale,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_SCALE",
                                        description: "Scale of the simulator",
-                                       is_string: true,
                                        optional: true,
                                        verify_block: proc do |value|
                                          available = ["25", "50", "75", "100"]
@@ -83,7 +79,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :orientation,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_ORIENTATION",
                                        description: "Device orientation",
-                                       is_string: true,
                                        default_value: "portrait",
                                        verify_block: proc do |value|
                                          available = ["portrait", "landscape"]
@@ -92,12 +87,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :language,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_LANGUAGE",
                                        description: "Device language in ISO 639-1 language code, e.g. 'de'",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :color,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_COLOR",
                                        description: "Color of the device",
-                                       is_string: true,
                                        default_value: "black",
                                        verify_block: proc do |value|
                                          available = ["black", "white", "silver", "gray"]
@@ -106,22 +99,18 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :launch_url,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_LAUNCH_URL",
                                        description: "Specify a deep link to open when your app is launched",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :os_version,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_OS_VERSION",
                                        description: "The operating system version on which to run your app, e.g. 10.3, 8.0",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :params,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_PARAMS",
                                        description: "Specify params value to be passed to Appetize",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :proxy,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_PROXY",
                                        description: "Specify a HTTP proxy to be passed to Appetize",
-                                       is_string: true,
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/appium.rb

@@ -105,71 +105,46 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(
-            key: :platform,
-            env_name: 'FL_APPIUM_PLATFORM',
-            description: 'Appium platform name',
-            is_string: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :spec_path,
-            env_name: 'FL_APPIUM_SPEC_PATH',
-            description: 'Path to Appium spec directory',
-            is_string: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :app_path,
-            env_name: 'FL_APPIUM_APP_FILE_PATH',
-            description: 'Path to Appium target app file',
-            is_string: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :invoke_appium_server,
-            env_name: 'FL_APPIUM_INVOKE_APPIUM_SERVER',
-            description: 'Use local Appium server with invoke automatically',
-            is_string: false,
-            default_value: true,
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :host,
-            env_name: 'FL_APPIUM_HOST',
-            description: 'Hostname of Appium server',
-            is_string: true,
-            default_value: '0.0.0.0',
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :port,
-            env_name: 'FL_APPIUM_PORT',
-            description: 'HTTP port of Appium server',
-            is_string: false,
-            default_value: 4723,
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :appium_path,
-            env_name: 'FL_APPIUM_EXECUTABLE_PATH',
-            description: 'Path to Appium executable',
-            is_string: true,
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :caps,
-            env_name: 'FL_APPIUM_CAPS',
-            description: 'Hash of caps for Appium::Driver',
-            is_string: false,
-            type: Hash,
-            optional: true
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :appium_lib,
-            env_name: 'FL_APPIUM_LIB',
-            description: 'Hash of appium_lib for Appium::Driver',
-            is_string: false,
-            type: Hash,
-            optional: true
-          )
+          FastlaneCore::ConfigItem.new(key: :platform,
+                                       env_name: 'FL_APPIUM_PLATFORM',
+                                       description: 'Appium platform name'),
+          FastlaneCore::ConfigItem.new(key: :spec_path,
+                                       env_name: 'FL_APPIUM_SPEC_PATH',
+                                       description: 'Path to Appium spec directory'),
+          FastlaneCore::ConfigItem.new(key: :app_path,
+                                       env_name: 'FL_APPIUM_APP_FILE_PATH',
+                                       description: 'Path to Appium target app file'),
+          FastlaneCore::ConfigItem.new(key: :invoke_appium_server,
+                                       env_name: 'FL_APPIUM_INVOKE_APPIUM_SERVER',
+                                       description: 'Use local Appium server with invoke automatically',
+                                       type: Boolean,
+                                       default_value: true,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :host,
+                                       env_name: 'FL_APPIUM_HOST',
+                                       description: 'Hostname of Appium server',
+                                       default_value: '0.0.0.0',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :port,
+                                       env_name: 'FL_APPIUM_PORT',
+                                       description: 'HTTP port of Appium server',
+                                       type: Integer,
+                                       default_value: 4723,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :appium_path,
+                                       env_name: 'FL_APPIUM_EXECUTABLE_PATH',
+                                       description: 'Path to Appium executable',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :caps,
+                                       env_name: 'FL_APPIUM_CAPS',
+                                       description: 'Hash of caps for Appium::Driver',
+                                       type: Hash,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :appium_lib,
+                                       env_name: 'FL_APPIUM_LIB',
+                                       description: 'Hash of appium_lib for Appium::Driver',
+                                       type: Hash,
+                                       optional: true)
         ]
       end