fastlane 2.183.1 → 2.185.1

data/fastlane/lib/fastlane/actions/create_keychain.rb

@@ -105,46 +105,45 @@ module Fastlane
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain name",
                                        conflicting_options: [:path],
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "KEYCHAIN_PATH",
                                        description: "Path to keychain",
-                                       is_string: true,
                                        conflicting_options: [:name],
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :password,
                                        env_name: "KEYCHAIN_PASSWORD",
                                        description: "Password for the keychain",
                                        sensitive: true,
+                                       code_gen_sensitive: true,
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :default_keychain,
                                        description: 'Should the newly created Keychain be the new system default keychain',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :unlock,
                                        description: 'Unlock keychain after create',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :timeout,
-                                       description: 'timeout interval in seconds. Set `false` if you want to specify "no time-out"',
-                                       is_string: false,
+                                       description: 'timeout interval in seconds',
+                                       type: Integer,
                                        default_value: 300),
           FastlaneCore::ConfigItem.new(key: :lock_when_sleeps,
                                        description: 'Lock keychain when the system sleeps',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :lock_after_timeout,
                                        description: 'Lock keychain after timeout interval',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :add_to_search_list,
                                        description: 'Add keychain to search list',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :require_create,
                                        description: 'Fail the action if the Keychain already exists',
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false)
         ]
       end

data/fastlane/lib/fastlane/actions/create_pull_request.rb

@@ -165,7 +165,6 @@ module Fastlane
                                        code_gen_sensitive: true,
                                        default_value: ENV["GITHUB_API_TOKEN"],
                                        default_value_dynamic: true,
-                                       is_string: true,
                                        conflicting_options: [:api_bearer],
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :api_bearer,
@@ -173,24 +172,20 @@ module Fastlane
                                        description: "Use a Bearer authorization token. Usually generated by Github Apps, e.g. GitHub Actions GITHUB_TOKEN environment variable",
                                        sensitive: true,
                                        code_gen_sensitive: true,
-                                       is_string: true,
                                        conflicting_options: [:api_token],
                                        optional: true,
                                        default_value: nil),
           FastlaneCore::ConfigItem.new(key: :repo,
                                        env_name: "GITHUB_PULL_REQUEST_REPO",
                                        description: "The name of the repository you want to submit the pull request to",
-                                       is_string: true,
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :title,
                                        env_name: "GITHUB_PULL_REQUEST_TITLE",
                                        description: "The title of the pull request",
-                                       is_string: true,
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :body,
                                        env_name: "GITHUB_PULL_REQUEST_BODY",
                                        description: "The contents of the pull request",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :draft,
                                        env_name: "GITHUB_PULL_REQUEST_DRAFT",
@@ -210,21 +205,17 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :head,
                                        env_name: "GITHUB_PULL_REQUEST_HEAD",
                                        description: "The name of the branch where your changes are implemented (defaults to the current branch name)",
-                                       is_string: true,
-                                       code_gen_sensitive: true,
                                        default_value: Actions.git_branch,
                                        default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :base,
                                        env_name: "GITHUB_PULL_REQUEST_BASE",
                                        description: "The name of the branch you want your changes pulled into (defaults to `master`)",
-                                       is_string: true,
                                        default_value: 'master',
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :api_url,
                                        env_name: "GITHUB_PULL_REQUEST_API_URL",
                                        description: "The URL of GitHub API - used when the Enterprise (default to `https://api.github.com`)",
-                                       is_string: true,
                                        code_gen_default_value: 'https://api.github.com',
                                        default_value: 'https://api.github.com',
                                        optional: true),

data/fastlane/lib/fastlane/actions/danger.rb

@@ -45,61 +45,56 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :use_bundle_exec,
                                        env_name: "FL_DANGER_USE_BUNDLE_EXEC",
                                        description: "Use bundle exec when there is a Gemfile presented",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        env_name: "FL_DANGER_VERBOSE",
                                        description: "Show more debugging information",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :danger_id,
                                        env_name: "FL_DANGER_ID",
                                        description: "The identifier of this Danger instance",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :dangerfile,
                                        env_name: "FL_DANGER_DANGERFILE",
                                        description: "The location of your Dangerfile",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :github_api_token,
                                        env_name: "FL_DANGER_GITHUB_API_TOKEN",
                                        description: "GitHub API token for danger",
                                        sensitive: true,
-                                       is_string: true,
+                                       code_gen_sensitive: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :fail_on_errors,
                                        env_name: "FL_DANGER_FAIL_ON_ERRORS",
                                        description: "Should always fail the build process, defaults to false",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :new_comment,
                                        env_name: "FL_DANGER_NEW_COMMENT",
                                        description: "Makes Danger post a new comment instead of editing its previous one",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :remove_previous_comments,
                                        env_name: "FL_DANGER_REMOVE_PREVIOUS_COMMENT",
                                        description: "Makes Danger remove all previous comment and create a new one in the end of the list",
-                                       is_string: false,
+                                       type: Boolean,
                                        optional: true,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :base,
                                        env_name: "FL_DANGER_BASE",
                                        description: "A branch/tag/commit to use as the base of the diff. [master|dev|stable]",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :head,
                                        env_name: "FL_DANGER_HEAD",
                                        description: "A branch/tag/commit to use as the head. [master|dev|stable]",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :pr,
                                        env_name: "FL_DANGER_PR",
                                        description: "Run danger on a specific pull request. e.g. \"https://github.com/danger/danger/pull/518\"",
-                                       is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :fail_if_no_pr,
                                        env_name: "FL_DANGER_FAIL_IF_NO_PR",

data/fastlane/lib/fastlane/actions/docs/capture_android_screenshots.md

@@ -29,7 +29,7 @@ gem install fastlane
 androidTestImplementation 'tools.fastlane:screengrab:x.x.x'
 ```
 
-The latest version is [ ![Download](https://api.bintray.com/packages/fastlane/fastlane/screengrab/images/download.svg) ](https://bintray.com/fastlane/fastlane/screengrab/_latestVersion)
+The latest version is [ ![Download](https://maven-badges.herokuapp.com/maven-central/tools.fastlane/screengrab/badge.svg)](https://search.maven.org/artifact/tools.fastlane/screengrab)
 
 As of Screengrab version 2.0.0, all Android test dependencies are AndroidX dependencies. This means a device with API 18+, Android 4.3 or greater is required. If you wish to capture screenshots with an older Android OS, then you must use a 1.x.x version.
 

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -288,7 +288,7 @@ reset_ratings(false)
 ##### app_rating_config_path
 You can set the app age ratings using _deliver_. You'll have to create and store a `JSON` configuration file. Copy the [template](https://github.com/fastlane/fastlane/blob/master/deliver/assets/example_rating_config.json) to your project folder and pass the path to the `JSON` file using the `app_rating_config_path` option.
 
-The keys/values on the top allow values from 0-2, and the items on the bottom allow only 0 or 1. More information in [#reference](#reference).
+The keys/values on the top allow one of 3 strings: "NONE", "INFREQUENT_OR_MILD" or "FREQUENT_OR_INTENSE", and the items on the bottom allow false or true. More information in [#reference](#reference).
 
 
 ## Metadata
@@ -591,9 +591,9 @@ Key | Editable While Live | Directory | Filename | Deprecated Filename
 
 **Values**
 
-- 0: None
-- 1: Infrequent/Mild
-- 2: Frequent/Intense
+- 0: None (Legacy value, use `NONE` instead)
+- 1: Infrequent/Mild (Legacy value, use `INFREQUENT_OR_MILD` instead)
+- 2: Frequent/Intense (Legacy value, use `FREQUENT_OR_INTENSE`instead)
 
 - `NONE`
 - `INFREQUENT_OR_MILD`
@@ -601,24 +601,43 @@ Key | Editable While Live | Directory | Filename | Deprecated Filename
 
 **Keys**
 
-- `violenceCartoonOrFantasy`
-- `violenceRealistic`
-- `violenceRealisticProlongedGraphicOrSadistic`
-- `profanityOrCrudeHumor`
-- `matureOrSuggestiveThemes`
-- `horrorOrFearThemes`
-- `medicalOrTreatmentInformation`
-- `alcoholTobaccoOrDrugUseOrReferences`
-- `gamblingSimulated`
-- `sexualContentOrNudity`
-- `sexualContentGraphicAndNudity`
+- 'alcoholTobaccoOrDrugUseOrReferences'
+- 'contests'
+- 'gamblingSimulated'
+- 'medicalOrTreatmentInformation'
+- 'profanityOrCrudeHumor'
+
+- 'sexualContentGraphicAndNudity'
+- 'sexualContentOrNudity'
+- 'horrorOrFearThemes'
+- 'matureOrSuggestiveThemes'
+- 'unrestrictedWebAccess'
+- 'violenceCartoonOrFantasy'
+- 'violenceRealisticProlongedGraphicOrSadistic'
+- 'violenceRealistic'
+- 'kidsAgeBand'
 
 #### Boolean
 
 **Keys**
 
+- `gambling`
+- 'seventeenPlus'
 - `unrestrictedWebAccess`
-- `gamblingAndContests`
+
+#### Kids Age
+
+**Values**
+
+- `FIVE_AND_UNDER`
+- `SIX_TO_EIGHT`
+- `NINE_TO_ELEVEN`
+- `null`
+
+**Keys**
+
+- `kidsAgeBand`
+
 </details>
 
 <br />

data/fastlane/lib/fastlane/actions/docs/upload_to_testflight.md

@@ -135,16 +135,16 @@ The output will look like this:
 
 ### Add a new tester
 
-To add a new tester to both your App Store Connect account and to your app (if given), use the `pilot add` command. This will create a new tester (if necessary) or add an existing tester to the app to test.
+To add a new tester to your App Store Connect account and to associate it to at least one testing group of your app, use the `pilot add` command. This will create a new tester (if necessary) or add an existing tester to the app to test.
 
 ```no-highlight
-fastlane pilot add email@invite.com
+fastlane pilot add email@invite.com -g group-1,group-2
 ```
 
 Additionally you can specify the app identifier (if necessary):
 
 ```no-highlight
-fastlane pilot add email@email.com -a com.krausefx.app
+fastlane pilot add email@email.com -a com.krausefx.app -g group-1,group-2
 ```
 
 ### Find a tester
@@ -173,12 +173,18 @@ The resulting output will look like this:
 
 ### Remove a tester
 
-This command will only remove external beta testers.
+This command will remove beta tester from app (from all internal and external groups)
 
 ```no-highlight
 fastlane pilot remove felix@krausefx.com
 ```
 
+You can also use `groups` option to remove the tester from the groups specified:
+
+```no-highlight
+fastlane pilot remove felix@krausefx.com -g group-1,group-2
+```
+
 ### Export testers
 
 To export all external testers to a CSV file. Useful if you need to import tester info to another system or a new account.

data/fastlane/lib/fastlane/actions/get_certificates.rb

@@ -12,8 +12,12 @@ module Fastlane
         return if Helper.test?
 
         begin
+          # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
+          unless params[:api_key_path]
+            params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+          end
+
           Cert.config = params # we alread have the finished config
-          Cert.config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
 
           Cert::Runner.new.launch
           cert_file_path = ENV["CER_FILE_PATH"]

data/fastlane/lib/fastlane/actions/get_provisioning_profile.rb

@@ -14,8 +14,12 @@ module Fastlane
         require 'sigh'
         require 'credentials_manager/appfile_config'
 
+        # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
+        unless values[:api_key_path]
+          values[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+        end
+
         Sigh.config = values # we already have the finished config
-        Sigh.config[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
 
         path = Sigh::Manager.start
 

data/fastlane/lib/fastlane/actions/push_to_git_remote.rb

@@ -3,8 +3,12 @@ module Fastlane
     # Push local changes to the remote branch
     class PushToGitRemoteAction < Action
       def self.run(params)
+        # Find the local git branch using HEAD or fallback to CI's ENV git branch if you're in detached HEAD state
+        local_git_branch = Actions.git_branch_name_using_HEAD
+        local_git_branch = Actions.git_branch unless local_git_branch && local_git_branch != "HEAD"
+
         local_branch = params[:local_branch]
-        local_branch ||= Actions.git_branch.gsub(%r{#{params[:remote]}\/}, '') if Actions.git_branch
+        local_branch ||= local_git_branch.gsub(%r{#{params[:remote]}\/}, '') if local_git_branch
         UI.user_error!('Failed to get the current branch.') unless local_branch
 
         remote_branch = params[:remote_branch] || local_branch

data/fastlane/lib/fastlane/actions/register_device.rb

@@ -16,9 +16,11 @@ module Fastlane
 
         platform = Spaceship::ConnectAPI::BundleIdPlatform.map(platform)
 
-        if (token = api_token(params))
-          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
           UI.message("Login to App Store Connect (#{params[:username]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -37,13 +39,6 @@ module Fastlane
         return udid
       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
-
       def self.description
         "Registers a new device to the Apple Dev Portal"
       end
@@ -80,6 +75,8 @@ module Fastlane
                                        env_names: ["FL_REGISTER_DEVICE_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]),

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -39,9 +39,11 @@ module Fastlane
         end
 
         require 'spaceship'
-        if (token = api_token(params))
-          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
           UI.message("Login to App Store Connect (#{params[:username]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -83,13 +85,6 @@ module Fastlane
         UI.crash!("Failed to register new device (name: #{name}, UDID: #{udid})")
       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
       #####################################################
@@ -129,6 +124,8 @@ module Fastlane
                                        env_names: ["FL_REGISTER_DEVICES_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]),

data/fastlane/lib/fastlane/actions/set_changelog.rb

@@ -6,9 +6,11 @@ module Fastlane
 
         # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
         # Prompts select team if multiple teams and none specified
-        if (token = self.api_token(params))
-          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
           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])
@@ -78,13 +80,6 @@ module Fastlane
         UI.success("👼  Successfully pushed the new changelog to for #{edit_version.version_string}")
       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
-
       def self.default_changelog_path
         File.join(FastlaneCore::FastlaneFolder.path.to_s, 'changelog.txt')
       end
@@ -122,6 +117,8 @@ module Fastlane
                                      env_names: ["FL_SET_CHANGELOG_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]),