fastlane 2.155.1 → 2.157.0

data/fastlane/lib/fastlane/actions/commit_version_bump.rb

@@ -220,7 +220,7 @@ module Fastlane
           'commit_version_bump',
           'commit_version_bump(
             message: "Version Bump",                    # create a commit with a custom message
-            xcodeproj: "./path/to/MyProject.xcodeproj", # optional, if you have multiple Xcode project files, you must specify your main project here
+            xcodeproj: "./path/to/MyProject.xcodeproj"  # optional, if you have multiple Xcode project files, you must specify your main project here
           )',
           'commit_version_bump(
             settings: true # Include Settings.bundle/Root.plist

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

@@ -49,6 +49,8 @@ The previous p12 configuration is still currently supported.
 
 ## Quick Start
 
+> Before using _supply_ to connect to Google Play Store, you'll need to set up your app manually first by uploading at least one build to Google Play Store. See [fastane/fastlane#14686](https://github.com/fastlane/fastlane/issues/14686) for more info.
+
 - `cd [your_project_folder]`
 - `fastlane supply init`
 - Make changes to the downloaded metadata, add images, screenshots and/or an APK

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

@@ -26,7 +26,23 @@ _pilot_ uses [spaceship.airforce](https://spaceship.airforce) to interact with A
 
 # Usage
 
-For all commands you can specify the Apple ID to use using `-u felix@krausefx.com`. If you execute _pilot_ in a project already using [_fastlane_](https://fastlane.tools) the username and app identifier will automatically be determined.
+For all commands, you can either use an [API Key](#app-store-connect-api-key) or your [Apple ID](#apple-id).
+
+### App Store Connect API Key
+
+The App Store Connect API Key is the preferred authentication method (if you are able to use it).
+
+- Uses offial App Store Connect API
+- No need for 2FA
+- Better performance over Apple ID
+
+Specify the API key using `--api_key_path ./path/to/api_key_info.json` or `--api_key "{\"key_id\": \"D83848D23\", \"issuer_id\": \"227b0bbf-ada8-458c-9d62-3d8022b7d07f\", \"key_filepath\": \"D83848D23.p8\"}"`
+
+Go to [Using App Store Connect API](/app-store-connect-api) for information on obtaining an API key, the _fastlane_ `api_key_info.json` format, and other API key usage.
+
+### Apple ID
+
+Specify the Apple ID to use using `-u felix@krausefx.com`. If you execute _pilot_ in a project already using [_fastlane_](https://fastlane.tools) the username and app identifier will automatically be determined.
 
 ## Uploading builds
 

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

@@ -5,8 +5,8 @@ module Fastlane
         require 'spaceship'
 
         UI.message("Login to App Store Connect (#{params[:username]})")
-        Spaceship::Tunes.login(params[:username])
-        Spaceship::Tunes.select_team
+        Spaceship::ConnectAPI.login(params[:username])
+        Spaceship::ConnectAPI.select_team
         UI.message("Login successful")
 
         app = Spaceship::ConnectAPI::App.find(params[:app_identifier])

data/fastlane/lib/fastlane/actions/sonar.rb

@@ -16,6 +16,7 @@ module Fastlane
         sonar_scanner_args << "-Dsonar.projectName=\"#{params[:project_name]}\"" if params[:project_name]
         sonar_scanner_args << "-Dsonar.projectVersion=\"#{params[:project_version]}\"" if params[:project_version]
         sonar_scanner_args << "-Dsonar.sources=\"#{params[:sources_path]}\"" if params[:sources_path]
+        sonar_scanner_args << "-Dsonar.exclusions=\"#{params[:exclusions]}\"" if params[:exclusions]
         sonar_scanner_args << "-Dsonar.language=\"#{params[:project_language]}\"" if params[:project_language]
         sonar_scanner_args << "-Dsonar.sourceEncoding=\"#{params[:source_encoding]}\"" if params[:source_encoding]
         sonar_scanner_args << "-Dsonar.login=\"#{params[:sonar_login]}\"" if params[:sonar_login]
@@ -81,6 +82,10 @@ module Fastlane
                                        env_name: "FL_SONAR_RUNNER_SOURCES_PATH",
                                        description: "Comma-separated paths to directories containing source files. Must either be specified here or inside the sonar project configuration file",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :exclusions,
+                                       env_name: "FL_SONAR_RUNNER_EXCLUSIONS",
+                                       description: "Comma-separated paths to directories to be excluded from the analysis",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :project_language,
                                        env_name: "FL_SONAR_RUNNER_PROJECT_LANGUAGE",
                                        description: "Language key, e.g. objc",

data/fastlane/lib/fastlane/actions/spaceship_stats.rb

@@ -0,0 +1,73 @@
+module Fastlane
+  module Actions
+    class SpaceshipStatsAction < Action
+      def self.run(params)
+        require 'fastlane_core/print_table'
+        require 'spaceship'
+
+        rows = []
+        Spaceship::StatsMiddleware.service_stats.each do |service, count|
+          rows << [service.name, service.auth_type, service.url, count]
+        end
+
+        puts("")
+        puts(Terminal::Table.new(
+               title: "Spaceship Stats",
+               headings: ["Service", "Auth Type", "URL", "Number of requests"],
+               rows: FastlaneCore::PrintTable.transform_output(rows)
+        ))
+        puts("")
+
+        if params[:print_request_logs]
+          log_rows = []
+          Spaceship::StatsMiddleware.request_logs.each do |request_log|
+            log_rows << [request_log.auth_type, request_log.url]
+          end
+
+          puts("")
+          puts(Terminal::Table.new(
+                 title: "Spaceship Request Log",
+                 headings: ["Auth Type", "URL"],
+                 rows: FastlaneCore::PrintTable.transform_output(log_rows)
+          ))
+          puts("")
+        end
+      end
+
+      def self.url_name(url_prefix)
+        Spaceship::StatsMiddleware::URL_PREFIXES[url_prefix]
+      end
+
+      def self.description
+        "Print out Spaceship stats from this session (number of request to each domain)"
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :print_request_logs,
+                                       description: "Print all URLs requested",
+                                       type: Boolean,
+                                       default_value: false)
+        ]
+      end
+
+      def self.example_code
+        [
+          'spaceship_stats'
+        ]
+      end
+
+      def self.category
+        :misc
+      end
+
+      def self.author
+        "joshdholtz"
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/upload_to_testflight.rb

@@ -15,6 +15,10 @@ module Fastlane
           values[:ipa] = File.expand_path(values[:ipa]) if values[:ipa]
         end
 
+        if values[:api_key_path].nil?
+          values[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+        end
+
         return values if Helper.test?
 
         if distribute_only

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.155.1'.freeze
+  VERSION = '2.157.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -14,4 +14,4 @@ class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -245,4 +245,4 @@ extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.30]
+// FastlaneRunnerAPIVersion [0.9.35]

data/fastlane/swift/Fastlane.swift

@@ -127,6 +127,35 @@ func appStoreBuildNumber(initialBuildNumber: Any,
     _ = runner.executeCommand(command)
 }
 
+/**
+ Load the App Store Connect API token to use in other fastlane tools and actions
+
+ - parameters:
+   - keyId: The key ID
+   - issuerId: The issuer ID
+   - keyFilepath: The path to the key p8 file
+   - keyContent: The content of the key p8 file
+   - duration: The token session duration
+   - inHouse: Is App Store or Enterprise (in house) team? App Store Connect API cannot not determine this on its own (yet)
+
+ Load the App Store Connect API token to use in other fastlane tools and actions
+ */
+func appStoreConnectApiKey(keyId: String,
+                           issuerId: String,
+                           keyFilepath: String? = nil,
+                           keyContent: String? = nil,
+                           duration: Int? = nil,
+                           inHouse: Bool? = nil)
+{
+    let command = RubyCommand(commandID: "", methodName: "app_store_connect_api_key", className: nil, args: [RubyCommand.Argument(name: "key_id", value: keyId),
+                                                                                                             RubyCommand.Argument(name: "issuer_id", value: issuerId),
+                                                                                                             RubyCommand.Argument(name: "key_filepath", value: keyFilepath),
+                                                                                                             RubyCommand.Argument(name: "key_content", value: keyContent),
+                                                                                                             RubyCommand.Argument(name: "duration", value: duration),
+                                                                                                             RubyCommand.Argument(name: "in_house", value: inHouse)])
+    _ = runner.executeCommand(command)
+}
+
 /**
  Upload your app to [Appaloosa Store](https://www.appaloosa-store.com/)
 
@@ -5149,6 +5178,8 @@ func pem(development: Bool = false,
  Alias for the `upload_to_testflight` action
 
  - parameters:
+   - apiKeyPath: Path to your App Store Connect API key JSON file
+   - apiKey: Path to your App Store Connect API key JSON file
    - username: Your Apple ID Username
    - appIdentifier: The bundle identifier of the app to upload or manage testers (optional)
    - appPlatform: The platform to use (optional)
@@ -5187,7 +5218,9 @@ func pem(development: Bool = false,
  More details can be found on https://docs.fastlane.tools/actions/pilot/.
  This integration will only do the TestFlight upload.
  */
-func pilot(username: String,
+func pilot(apiKeyPath: String? = nil,
+           apiKey: [String: Any]? = nil,
+           username: String,
            appIdentifier: String? = nil,
            appPlatform: String = "ios",
            appleId: String? = nil,
@@ -5222,7 +5255,9 @@ func pilot(username: String,
            waitForUploadedBuild: Bool = false,
            rejectBuildWaitingForReview: Bool = false)
 {
-    let command = RubyCommand(commandID: "", methodName: "pilot", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
+    let command = RubyCommand(commandID: "", methodName: "pilot", className: nil, args: [RubyCommand.Argument(name: "api_key_path", value: apiKeyPath),
+                                                                                         RubyCommand.Argument(name: "api_key", value: apiKey),
+                                                                                         RubyCommand.Argument(name: "username", value: username),
                                                                                          RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                          RubyCommand.Argument(name: "app_platform", value: appPlatform),
                                                                                          RubyCommand.Argument(name: "apple_id", value: appleId),
@@ -7157,6 +7192,7 @@ func snapshot(workspace: Any? = snapshotfile.workspace,
    - projectName: The name of the project that gets displayed on the sonar report page. Must either be specified here or inside the sonar project configuration file
    - projectVersion: The project's version that gets displayed on the sonar report page. Must either be specified here or inside the sonar project configuration file
    - sourcesPath: Comma-separated paths to directories containing source files. Must either be specified here or inside the sonar project configuration file
+   - exclusions: Comma-separated paths to directories to be excluded from the analysis
    - projectLanguage: Language key, e.g. objc
    - sourceEncoding: Used encoding of source files, e.g., UTF-8
    - sonarRunnerArgs: Pass additional arguments to sonar-scanner. Be sure to provide the arguments with a leading `-D` e.g. FL_SONAR_RUNNER_ARGS="-Dsonar.verbose=true"
@@ -7178,6 +7214,7 @@ func sonar(projectConfigurationPath: String? = nil,
            projectName: String? = nil,
            projectVersion: String? = nil,
            sourcesPath: String? = nil,
+           exclusions: String? = nil,
            projectLanguage: String? = nil,
            sourceEncoding: String? = nil,
            sonarRunnerArgs: String? = nil,
@@ -7194,6 +7231,7 @@ func sonar(projectConfigurationPath: String? = nil,
                                                                                          RubyCommand.Argument(name: "project_name", value: projectName),
                                                                                          RubyCommand.Argument(name: "project_version", value: projectVersion),
                                                                                          RubyCommand.Argument(name: "sources_path", value: sourcesPath),
+                                                                                         RubyCommand.Argument(name: "exclusions", value: exclusions),
                                                                                          RubyCommand.Argument(name: "project_language", value: projectLanguage),
                                                                                          RubyCommand.Argument(name: "source_encoding", value: sourceEncoding),
                                                                                          RubyCommand.Argument(name: "sonar_runner_args", value: sonarRunnerArgs),
@@ -7233,6 +7271,16 @@ func spaceshipLogs(latest: Bool = true,
     _ = runner.executeCommand(command)
 }
 
+/**
+ Print out Spaceship stats from this session (number of request to each domain)
+
+ - parameter printRequestLogs: Print all URLs requested
+ */
+func spaceshipStats(printRequestLogs: Bool = false) {
+    let command = RubyCommand(commandID: "", methodName: "spaceship_stats", className: nil, args: [RubyCommand.Argument(name: "print_request_logs", value: printRequestLogs)])
+    _ = runner.executeCommand(command)
+}
+
 /**
  Upload dSYM file to [Splunk MINT](https://mint.splunk.com/)
 
@@ -7705,6 +7753,8 @@ func testfairy(apiKey: String,
  Alias for the `upload_to_testflight` action
 
  - parameters:
+   - apiKeyPath: Path to your App Store Connect API key JSON file
+   - apiKey: Path to your App Store Connect API key JSON file
    - username: Your Apple ID Username
    - appIdentifier: The bundle identifier of the app to upload or manage testers (optional)
    - appPlatform: The platform to use (optional)
@@ -7743,7 +7793,9 @@ func testfairy(apiKey: String,
  More details can be found on https://docs.fastlane.tools/actions/pilot/.
  This integration will only do the TestFlight upload.
  */
-func testflight(username: String,
+func testflight(apiKeyPath: String? = nil,
+                apiKey: [String: Any]? = nil,
+                username: String,
                 appIdentifier: String? = nil,
                 appPlatform: String = "ios",
                 appleId: String? = nil,
@@ -7778,7 +7830,9 @@ func testflight(username: String,
                 waitForUploadedBuild: Bool = false,
                 rejectBuildWaitingForReview: Bool = false)
 {
-    let command = RubyCommand(commandID: "", methodName: "testflight", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
+    let command = RubyCommand(commandID: "", methodName: "testflight", className: nil, args: [RubyCommand.Argument(name: "api_key_path", value: apiKeyPath),
+                                                                                              RubyCommand.Argument(name: "api_key", value: apiKey),
+                                                                                              RubyCommand.Argument(name: "username", value: username),
                                                                                               RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                               RubyCommand.Argument(name: "app_platform", value: appPlatform),
                                                                                               RubyCommand.Argument(name: "apple_id", value: appleId),
@@ -8648,6 +8702,8 @@ func uploadToPlayStoreInternalAppSharing(packageName: String,
  Upload new binary to App Store Connect for TestFlight beta testing (via _pilot_)
 
  - parameters:
+   - apiKeyPath: Path to your App Store Connect API key JSON file
+   - apiKey: Path to your App Store Connect API key JSON file
    - username: Your Apple ID Username
    - appIdentifier: The bundle identifier of the app to upload or manage testers (optional)
    - appPlatform: The platform to use (optional)
@@ -8686,7 +8742,9 @@ func uploadToPlayStoreInternalAppSharing(packageName: String,
  More details can be found on https://docs.fastlane.tools/actions/pilot/.
  This integration will only do the TestFlight upload.
  */
-func uploadToTestflight(username: String,
+func uploadToTestflight(apiKeyPath: String? = nil,
+                        apiKey: [String: Any]? = nil,
+                        username: String,
                         appIdentifier: String? = nil,
                         appPlatform: String = "ios",
                         appleId: String? = nil,
@@ -8721,7 +8779,9 @@ func uploadToTestflight(username: String,
                         waitForUploadedBuild: Bool = false,
                         rejectBuildWaitingForReview: Bool = false)
 {
-    let command = RubyCommand(commandID: "", methodName: "upload_to_testflight", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
+    let command = RubyCommand(commandID: "", methodName: "upload_to_testflight", className: nil, args: [RubyCommand.Argument(name: "api_key_path", value: apiKeyPath),
+                                                                                                        RubyCommand.Argument(name: "api_key", value: apiKey),
+                                                                                                        RubyCommand.Argument(name: "username", value: username),
                                                                                                         RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                                         RubyCommand.Argument(name: "app_platform", value: appPlatform),
                                                                                                         RubyCommand.Argument(name: "apple_id", value: appleId),
@@ -9058,7 +9118,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode-11.5.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode-12.beta.5.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false)
 {
     let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
@@ -9204,4 +9264,4 @@ let snapshotfile: Snapshotfile = Snapshotfile()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.83]
+// FastlaneRunnerAPIVersion [0.9.88]

data/fastlane/swift/Gymfile.swift

@@ -14,4 +14,4 @@ class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/GymfileProtocol.swift

@@ -181,4 +181,4 @@ extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.33]
+// FastlaneRunnerAPIVersion [0.9.38]

data/fastlane/swift/Matchfile.swift

@@ -14,4 +14,4 @@ class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -165,4 +165,4 @@ extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.27]
+// FastlaneRunnerAPIVersion [0.9.32]

data/fastlane/swift/Precheckfile.swift

@@ -14,4 +14,4 @@ class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -33,4 +33,4 @@ extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.26]
+// FastlaneRunnerAPIVersion [0.9.31]

data/fastlane/swift/Scanfile.swift

@@ -14,4 +14,4 @@ class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -257,4 +257,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.38]
+// FastlaneRunnerAPIVersion [0.9.43]

data/fastlane/swift/Screengrabfile.swift

@@ -14,4 +14,4 @@ class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -93,4 +93,4 @@ extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.28]
+// FastlaneRunnerAPIVersion [0.9.33]

data/fastlane/swift/Snapshotfile.swift

@@ -14,4 +14,4 @@ class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.155.1
+// Generated with fastlane 2.157.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -181,4 +181,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.22]
+// FastlaneRunnerAPIVersion [0.9.27]

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -170,38 +170,44 @@ module FastlaneCore
 
   # Generates commands and executes the iTMSTransporter through the shell script it provides by the same name
   class ShellScriptTransporterExecutor < TransporterExecutor
-    def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
+    def build_upload_command(username, password, source = "/tmp", provider_short_name = "", jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       [
         '"' + Helper.transporter_path + '"',
         "-m upload",
-        "-u #{username.shellescape}",
-        "-p #{shell_escaped_password(password)}",
+        ("-u #{username.shellescape}" unless use_jwt),
+        ("-p #{shell_escaped_password(password)}" unless use_jwt),
+        ("-jwt #{jwt}" if use_jwt),
         "-f \"#{source}\"",
         additional_upload_parameters, # that's here, because the user might overwrite the -t option
         "-k 100000",
         ("-WONoPause true" if Helper.windows?), # Windows only: process instantly returns instead of waiting for key press
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?)
+        ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?)
       ].compact.join(' ')
     end
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
+    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       [
         '"' + Helper.transporter_path + '"',
         "-m lookupMetadata",
-        "-u #{username.shellescape}",
-        "-p #{shell_escaped_password(password)}",
+        ("-u #{username.shellescape}" unless use_jwt),
+        ("-p #{shell_escaped_password(password)}" unless use_jwt),
+        ("-jwt #{jwt}" if use_jwt),
         "-apple_id #{apple_id}",
         "-destination '#{destination}'",
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?)
+        ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?)
       ].compact.join(' ')
     end
 
-    def build_provider_ids_command(username, password)
+    def build_provider_ids_command(username, password, jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       [
         '"' + Helper.transporter_path + '"',
         '-m provider',
-        "-u \"#{username}\"",
-        "-p #{shell_escaped_password(password)}"
+        ("-u \"#{username.shellescape}\"" unless use_jwt),
+        ("-p #{shell_escaped_password(password)}" unless use_jwt),
+        ("-jwt #{jwt}" if use_jwt)
       ].compact.join(' ')
     end
 
@@ -246,18 +252,20 @@ module FastlaneCore
   # Generates commands and executes the iTMSTransporter by invoking its Java app directly, to avoid the crazy parameter
   # escaping problems in its accompanying shell script.
   class JavaTransporterExecutor < TransporterExecutor
-    def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
+    def build_upload_command(username, password, source = "/tmp", provider_short_name = "", jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
-          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
+          ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',
           '-m upload',
-          "-u #{username.shellescape}",
-          "-p @env:ITMS_TRANSPORTER_PASSWORD",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p @env:ITMS_TRANSPORTER_PASSWORD" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           "-f #{source.shellescape}",
           additional_upload_parameters, # that's here, because the user might overwrite the -t option
           '-k 100000',
-          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ') # compact gets rid of the possibly nil ENV value
       else
@@ -272,28 +280,31 @@ module FastlaneCore
           '-Dsun.net.http.retryPost=false',
           java_code_option,
           '-m upload',
-          "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p #{password.shellescape}" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           "-f #{source.shellescape}",
           additional_upload_parameters, # that's here, because the user might overwrite the -t option
           '-k 100000',
-          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ') # compact gets rid of the possibly nil ENV value
       end
     end
 
-    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
+    def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "", jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
-          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
+          ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',
           '-m lookupMetadata',
-          "-u #{username.shellescape}",
-          "-p @env:ITMS_TRANSPORTER_PASSWORD",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p @env:ITMS_TRANSPORTER_PASSWORD" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           "-apple_id #{apple_id.shellescape}",
           "-destination #{destination.shellescape}",
-          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       else
@@ -308,24 +319,27 @@ module FastlaneCore
           '-Dsun.net.http.retryPost=false',
           java_code_option,
           '-m lookupMetadata',
-          "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p #{password.shellescape}" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           "-apple_id #{apple_id.shellescape}",
           "-destination #{destination.shellescape}",
-          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          ("-itc_provider #{provider_short_name}" if jwt.nil? && !provider_short_name.to_s.empty?),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       end
     end
 
-    def build_provider_ids_command(username, password)
+    def build_provider_ids_command(username, password, jwt = nil)
+      use_jwt = !jwt.to_s.empty?
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
-          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
+          ("ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}" unless use_jwt),
           'xcrun iTMSTransporter',
           '-m provider',
-          "-u #{username.shellescape}",
-          "-p @env:ITMS_TRANSPORTER_PASSWORD",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p @env:ITMS_TRANSPORTER_PASSWORD" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       else
@@ -340,8 +354,9 @@ module FastlaneCore
           '-Dsun.net.http.retryPost=false',
           java_code_option,
           '-m provider',
-          "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          ("-u #{username.shellescape}" unless use_jwt),
+          ("-p #{password.shellescape}" unless use_jwt),
+          ("-jwt #{jwt}" if use_jwt),
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       end
@@ -399,15 +414,19 @@ module FastlaneCore
     #                            see: https://github.com/fastlane/fastlane/issues/1524#issuecomment-196370628
     #                            for more information about how to use the iTMSTransporter to list your provider
     #                            short names
-    def initialize(user = nil, password = nil, use_shell_script = false, provider_short_name = nil)
+    def initialize(user = nil, password = nil, use_shell_script = false, provider_short_name = nil, jwt = nil)
       # Xcode 6.x doesn't have the same iTMSTransporter Java setup as later Xcode versions, so
       # we can't default to using the newer direct Java invocation strategy for those versions.
       use_shell_script ||= Helper.is_mac? && Helper.xcode_version.start_with?('6.')
       use_shell_script ||= Helper.windows?
       use_shell_script ||= Feature.enabled?('FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT')
 
-      @user = user
-      @password = password || load_password_for_transporter
+      if jwt.to_s.empty?
+        @user = user
+        @password = password || load_password_for_transporter
+      end
+
+      @jwt = jwt
 
       @transporter_executor = use_shell_script ? ShellScriptTransporterExecutor.new : JavaTransporterExecutor.new
       @provider_short_name = provider_short_name
@@ -422,9 +441,12 @@ module FastlaneCore
     def download(app_id, dir = nil)
       dir ||= "/tmp"
 
+      password_placeholder = @jwt.nil? ? 'YourPassword' : nil
+      jwt_placeholder = @jwt.nil? ? nil : 'YourJWT'
+
       UI.message("Going to download app metadata from App Store Connect")
-      command = @transporter_executor.build_download_command(@user, @password, app_id, dir, @provider_short_name)
-      UI.verbose(@transporter_executor.build_download_command(@user, 'YourPassword', app_id, dir, @provider_short_name))
+      command = @transporter_executor.build_download_command(@user, @password, app_id, dir, @provider_short_name, @jwt)
+      UI.verbose(@transporter_executor.build_download_command(@user, password_placeholder, app_id, dir, @provider_short_name, jwt_placeholder))
 
       begin
         result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
@@ -459,8 +481,11 @@ module FastlaneCore
       UI.message("Going to upload updated app to App Store Connect")
       UI.success("This might take a few minutes. Please don't interrupt the script.")
 
-      command = @transporter_executor.build_upload_command(@user, @password, actual_dir, @provider_short_name)
-      UI.verbose(@transporter_executor.build_upload_command(@user, 'YourPassword', actual_dir, @provider_short_name))
+      password_placeholder = @jwt.nil? ? 'YourPassword' : nil
+      jwt_placeholder = @jwt.nil? ? nil : 'YourJWT'
+
+      command = @transporter_executor.build_upload_command(@user, @password, actual_dir, @provider_short_name, @jwt)
+      UI.verbose(@transporter_executor.build_upload_command(@user, password_placeholder, actual_dir, @provider_short_name, jwt_placeholder))
 
       begin
         result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
@@ -481,8 +506,12 @@ module FastlaneCore
     end
 
     def provider_ids
-      command = @transporter_executor.build_provider_ids_command(@user, @password)
-      UI.verbose(@transporter_executor.build_provider_ids_command(@user, 'YourPassword'))
+      password_placeholder = @jwt.nil? ? 'YourPassword' : nil
+      jwt_placeholder = @jwt.nil? ? nil : 'YourJWT'
+
+      command = @transporter_executor.build_provider_ids_command(@user, @password, @jwt)
+      UI.verbose(@transporter_executor.build_provider_ids_command(@user, password_placeholder, jwt_placeholder))
+
       lines = []
       begin
         result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?) { |xs| lines = xs }