fastlane 2.104.0 → 2.105.1

data/fastlane/swift/Fastlane.swift

@@ -1310,7 +1310,8 @@ func deploygate(apiToken: String,
                 message: String = "No changelog provided",
                 distributionKey: String? = nil,
                 releaseNote: String? = nil,
-                disableNotify: Bool = false) {
+                disableNotify: Bool = false,
+                distributionName: String? = nil) {
   let command = RubyCommand(commandID: "", methodName: "deploygate", className: nil, args: [RubyCommand.Argument(name: "api_token", value: apiToken),
                                                                                             RubyCommand.Argument(name: "user", value: user),
                                                                                             RubyCommand.Argument(name: "ipa", value: ipa),
@@ -1318,7 +1319,8 @@ func deploygate(apiToken: String,
                                                                                             RubyCommand.Argument(name: "message", value: message),
                                                                                             RubyCommand.Argument(name: "distribution_key", value: distributionKey),
                                                                                             RubyCommand.Argument(name: "release_note", value: releaseNote),
-                                                                                            RubyCommand.Argument(name: "disable_notify", value: disableNotify)])
+                                                                                            RubyCommand.Argument(name: "disable_notify", value: disableNotify),
+                                                                                            RubyCommand.Argument(name: "distribution_name", value: distributionName)])
   _ = runner.executeCommand(command)
 }
 func dotgpgEnvironment(dotgpgFile: String) {
@@ -1841,7 +1843,7 @@ func hockey(apk: String? = nil,
             uploadDsymOnly: Bool = false,
             ownerId: String? = nil,
             strategy: String = "add",
-            timeout: String? = nil,
+            timeout: Int? = nil,
             bypassCdn: Bool = false,
             dsaSignature: String = "") {
   let command = RubyCommand(commandID: "", methodName: "hockey", className: nil, args: [RubyCommand.Argument(name: "apk", value: apk),
@@ -2482,11 +2484,13 @@ func pushGitTags(force: Bool = false,
 func pushToGitRemote(localBranch: String? = nil,
                      remoteBranch: String? = nil,
                      force: Bool = false,
+                     forceWithLease: Bool = false,
                      tags: Bool = true,
                      remote: String = "origin") {
   let command = RubyCommand(commandID: "", methodName: "push_to_git_remote", className: nil, args: [RubyCommand.Argument(name: "local_branch", value: localBranch),
                                                                                                     RubyCommand.Argument(name: "remote_branch", value: remoteBranch),
                                                                                                     RubyCommand.Argument(name: "force", value: force),
+                                                                                                    RubyCommand.Argument(name: "force_with_lease", value: forceWithLease),
                                                                                                     RubyCommand.Argument(name: "tags", value: tags),
                                                                                                     RubyCommand.Argument(name: "remote", value: remote)])
   _ = runner.executeCommand(command)
@@ -2616,6 +2620,7 @@ func runTests(workspace: String? = nil,
               buildlogPath: String = "~/Library/Logs/scan",
               includeSimulatorLogs: Bool = false,
               formatter: String? = nil,
+              xcprettyArgs: String? = nil,
               maxConcurrentSimulators: Int? = nil,
               disableConcurrentTesting: Bool = false,
               testWithoutBuilding: Bool? = nil,
@@ -2659,6 +2664,7 @@ func runTests(workspace: String? = nil,
                                                                                            RubyCommand.Argument(name: "buildlog_path", value: buildlogPath),
                                                                                            RubyCommand.Argument(name: "include_simulator_logs", value: includeSimulatorLogs),
                                                                                            RubyCommand.Argument(name: "formatter", value: formatter),
+                                                                                           RubyCommand.Argument(name: "xcpretty_args", value: xcprettyArgs),
                                                                                            RubyCommand.Argument(name: "max_concurrent_simulators", value: maxConcurrentSimulators),
                                                                                            RubyCommand.Argument(name: "disable_concurrent_testing", value: disableConcurrentTesting),
                                                                                            RubyCommand.Argument(name: "test_without_building", value: testWithoutBuilding),
@@ -2744,6 +2750,7 @@ func scan(workspace: String? = scanfile.workspace,
           buildlogPath: String = scanfile.buildlogPath,
           includeSimulatorLogs: Bool = scanfile.includeSimulatorLogs,
           formatter: String? = scanfile.formatter,
+          xcprettyArgs: String? = scanfile.xcprettyArgs,
           maxConcurrentSimulators: Int? = scanfile.maxConcurrentSimulators,
           disableConcurrentTesting: Bool = scanfile.disableConcurrentTesting,
           testWithoutBuilding: Bool? = scanfile.testWithoutBuilding,
@@ -2787,6 +2794,7 @@ func scan(workspace: String? = scanfile.workspace,
                                                                                       RubyCommand.Argument(name: "buildlog_path", value: buildlogPath),
                                                                                       RubyCommand.Argument(name: "include_simulator_logs", value: includeSimulatorLogs),
                                                                                       RubyCommand.Argument(name: "formatter", value: formatter),
+                                                                                      RubyCommand.Argument(name: "xcpretty_args", value: xcprettyArgs),
                                                                                       RubyCommand.Argument(name: "max_concurrent_simulators", value: maxConcurrentSimulators),
                                                                                       RubyCommand.Argument(name: "disable_concurrent_testing", value: disableConcurrentTesting),
                                                                                       RubyCommand.Argument(name: "test_without_building", value: testWithoutBuilding),
@@ -3281,7 +3289,8 @@ func supply(packageName: String,
             mappingPaths: [String]? = nil,
             rootUrl: String? = nil,
             checkSupersededTracks: Bool = false,
-            timeout: Int = 300) {
+            timeout: Int = 300,
+            deactivateOnPromote: Bool = true) {
   let command = RubyCommand(commandID: "", methodName: "supply", className: nil, args: [RubyCommand.Argument(name: "package_name", value: packageName),
                                                                                         RubyCommand.Argument(name: "track", value: track),
                                                                                         RubyCommand.Argument(name: "rollout", value: rollout),
@@ -3304,7 +3313,8 @@ func supply(packageName: String,
                                                                                         RubyCommand.Argument(name: "mapping_paths", value: mappingPaths),
                                                                                         RubyCommand.Argument(name: "root_url", value: rootUrl),
                                                                                         RubyCommand.Argument(name: "check_superseded_tracks", value: checkSupersededTracks),
-                                                                                        RubyCommand.Argument(name: "timeout", value: timeout)])
+                                                                                        RubyCommand.Argument(name: "timeout", value: timeout),
+                                                                                        RubyCommand.Argument(name: "deactivate_on_promote", value: deactivateOnPromote)])
   _ = runner.executeCommand(command)
 }
 func swiftlint(mode: String = "lint",
@@ -3771,7 +3781,8 @@ func uploadToPlayStore(packageName: String,
                        mappingPaths: [String]? = nil,
                        rootUrl: String? = nil,
                        checkSupersededTracks: Bool = false,
-                       timeout: Int = 300) {
+                       timeout: Int = 300,
+                       deactivateOnPromote: Bool = true) {
   let command = RubyCommand(commandID: "", methodName: "upload_to_play_store", className: nil, args: [RubyCommand.Argument(name: "package_name", value: packageName),
                                                                                                       RubyCommand.Argument(name: "track", value: track),
                                                                                                       RubyCommand.Argument(name: "rollout", value: rollout),
@@ -3794,7 +3805,8 @@ func uploadToPlayStore(packageName: String,
                                                                                                       RubyCommand.Argument(name: "mapping_paths", value: mappingPaths),
                                                                                                       RubyCommand.Argument(name: "root_url", value: rootUrl),
                                                                                                       RubyCommand.Argument(name: "check_superseded_tracks", value: checkSupersededTracks),
-                                                                                                      RubyCommand.Argument(name: "timeout", value: timeout)])
+                                                                                                      RubyCommand.Argument(name: "timeout", value: timeout),
+                                                                                                      RubyCommand.Argument(name: "deactivate_on_promote", value: deactivateOnPromote)])
   _ = runner.executeCommand(command)
 }
 func uploadToTestflight(username: String,
@@ -3971,7 +3983,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode-10.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),
                                                                                       RubyCommand.Argument(name: "project", value: project),
@@ -4017,10 +4029,12 @@ func xcversion(version: String) {
 }
 @discardableResult func zip(path: String,
                             outputPath: String? = nil,
-                            verbose: Bool = true) -> String {
+                            verbose: Bool = true,
+                            password: String? = nil) -> String {
   let command = RubyCommand(commandID: "", methodName: "zip", className: nil, args: [RubyCommand.Argument(name: "path", value: path),
                                                                                      RubyCommand.Argument(name: "output_path", value: outputPath),
-                                                                                     RubyCommand.Argument(name: "verbose", value: verbose)])
+                                                                                     RubyCommand.Argument(name: "verbose", value: verbose),
+                                                                                     RubyCommand.Argument(name: "password", value: password)])
   return runner.executeCommand(command)
 }
 
@@ -4077,4 +4091,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.28]
+// FastlaneRunnerAPIVersion [0.9.29]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane/swift/ScanfileProtocol.swift

@@ -18,6 +18,7 @@ protocol ScanfileProtocol: class {
   var buildlogPath: String { get }
   var includeSimulatorLogs: Bool { get }
   var formatter: String? { get }
+  var xcprettyArgs: String? { get }
   var maxConcurrentSimulators: Int? { get }
   var disableConcurrentTesting: Bool { get }
   var testWithoutBuilding: Bool? { get }
@@ -64,6 +65,7 @@ extension ScanfileProtocol {
   var buildlogPath: String { return "~/Library/Logs/scan" }
   var includeSimulatorLogs: Bool { return false }
   var formatter: String? { return nil }
+  var xcprettyArgs: String? { return nil }
   var maxConcurrentSimulators: Int? { return nil }
   var disableConcurrentTesting: Bool { return false }
   var testWithoutBuilding: Bool? { return nil }
@@ -92,4 +94,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.4]
+// FastlaneRunnerAPIVersion [0.9.5]

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.104.0
+// Generated with fastlane 2.105.1

data/fastlane_core/lib/fastlane_core/analytics/action_completion_context.rb

@@ -12,19 +12,22 @@ module FastlaneCore
     attr_accessor :p_hash
     attr_accessor :action_name
     attr_accessor :status
+    attr_accessor :fastlane_client_language
 
-    def initialize(p_hash: nil, action_name: nil, status: nil)
+    def initialize(p_hash: nil, action_name: nil, status: nil, fastlane_client_language: nil)
       @p_hash = p_hash
       @action_name = action_name
       @status = status
+      @fastlane_client_language = fastlane_client_language
     end
 
-    def self.context_for_action_name(action_name, args: nil, status: nil)
+    def self.context_for_action_name(action_name, fastlane_client_language: :ruby, args: nil, status: nil)
       app_id_guesser = FastlaneCore::AppIdentifierGuesser.new(args: args)
       return self.new(
         action_name: action_name,
         p_hash: app_id_guesser.p_hash,
-        status: status
+        status: status,
+        fastlane_client_language: fastlane_client_language
       )
     end
   end

data/fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb

@@ -8,22 +8,22 @@ module FastlaneCore
     attr_accessor :action_name
     attr_accessor :p_hash
     attr_accessor :platform
-    attr_accessor :configuration_language # example: ruby fastfile, swift fastfile
+    attr_accessor :fastlane_client_language # example: ruby fastfile, swift fastfile
 
-    def initialize(action_name: nil, p_hash: UNKNOWN_P_HASH, platform: nil, configuration_language: nil)
+    def initialize(action_name: nil, p_hash: UNKNOWN_P_HASH, platform: nil, fastlane_client_language: nil)
       @action_name = action_name
       @p_hash = p_hash
       @platform = platform
-      @configuration_language = configuration_language
+      @fastlane_client_language = fastlane_client_language
     end
 
-    def self.context_for_action_name(action_name, configuration_language: "ruby", args: nil)
+    def self.context_for_action_name(action_name, fastlane_client_language: :ruby, args: nil)
       app_id_guesser = FastlaneCore::AppIdentifierGuesser.new(args: args)
       return self.new(
         action_name: action_name,
         p_hash: app_id_guesser.p_hash || UNKNOWN_P_HASH,
         platform: app_id_guesser.platform,
-        configuration_language: configuration_language
+        fastlane_client_language: fastlane_client_language
       )
     end
 

data/fastlane_core/lib/fastlane_core/analytics/analytics_event_builder.rb

@@ -2,16 +2,18 @@ module FastlaneCore
   class AnalyticsEventBuilder
     attr_accessor :action_name
 
-    def initialize(p_hash: nil, session_id: nil, action_name: nil)
+    # fastlane_client_language valid options are :ruby or :swift
+    def initialize(p_hash: nil, session_id: nil, action_name: nil, fastlane_client_language: :ruby)
       @p_hash = p_hash
       @session_id = session_id
       @action_name = action_name
+      @fastlane_client_language = fastlane_client_language
     end
 
     def new_event(action_stage)
       {
         client_id: @p_hash,
-        category: :undefined,
+        category: "fastlane Client Langauge - #{@fastlane_client_language}",
         action: action_stage,
         label: action_name,
         value: nil

data/fastlane_core/lib/fastlane_core/analytics/analytics_session.rb

@@ -31,7 +31,8 @@ module FastlaneCore
       builder = AnalyticsEventBuilder.new(
         p_hash: launch_context.p_hash,
         session_id: session_id,
-        action_name: nil
+        action_name: nil,
+        fastlane_client_language: launch_context.fastlane_client_language
       )
 
       launch_event = builder.new_event(:launch)

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -28,7 +28,7 @@ module FastlaneCore
       if /\b0 valid identities found\b/ =~ available
         UI.error([
           "There are no local code signing identities found.",
-          "You can run `security find-identity -v -p codesigning` to get this output.",
+          "You can run" << " `security find-identity -v -p codesigning #{in_keychain}".rstrip << "` to get this output.",
           "This Stack Overflow thread has more information: https://stackoverflow.com/q/35390072/774.",
           "(Check in Keychain Access for an expired WWDR certificate: https://stackoverflow.com/a/35409835/774 has more info.)"
         ].join("\n"))

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -238,7 +238,7 @@ module FastlaneCore
       elsif data_type == Float
         return value.to_f if value.to_f.to_s == value.to_s
       elsif allow_shell_conversion
-        return Shellwords.join(value) if value.kind_of?(Array)
+        return value.shelljoin if value.kind_of?(Array)
         return value.map { |k, v| "#{k.to_s.shellescape}=#{v.shellescape}" }.join(' ') if value.kind_of?(Hash)
       elsif data_type != String
         # Special treatment if the user specified true, false or YES, NO

data/fastlane_core/lib/fastlane_core/core_ext/shellwords.rb

@@ -0,0 +1,63 @@
+require_relative '../helper'
+require 'shellwords'
+
+# Here be monkey patches
+
+class String
+  # CrossplatformShellwords
+  def shellescape
+    CrossplatformShellwords.shellescape(self)
+  end
+end
+
+class Array
+  def shelljoin
+    CrossplatformShellwords.shelljoin(self)
+  end
+end
+
+# Here be helper
+
+module CrossplatformShellwords
+  # handle switching between implementations of shellescape
+  def shellescape(str)
+    if FastlaneCore::Helper.windows?
+      WindowsShellwords.shellescape(str)
+    else
+      # using `escape` instead of expected `shellescape` here
+      # which corresponds to Shellword's `String.shellescape` implementation
+      # https://github.com/ruby/ruby/blob/1cf2bb4b2085758112503e7da7414d1ef52d4f48/lib/shellwords.rb#L216
+      Shellwords.escape(str)
+    end
+  end
+  module_function :shellescape
+
+  # make sure local implementation is also used in shelljoin
+  def shelljoin(array)
+    array.map { |arg| shellescape(arg) }.join(' ')
+  end
+  module_function :shelljoin
+end
+
+# Windows implementation
+module WindowsShellwords
+  def shellescape(str)
+    str = str.to_s
+
+    # An empty argument will be skipped, so return empty quotes.
+    # https://github.com/ruby/ruby/blob/a6413848153e6c37f6b0fea64e3e871460732e34/lib/shellwords.rb#L142-L143
+    return '""'.dup if str.empty?
+
+    str = str.dup
+
+    # wrap in double quotes if contains space
+    if str =~ /\s/
+      # double quotes have to be doubled if will be quoted
+      str.gsub!('"', '""')
+      return '"' + str + '"'
+    else
+      return str
+    end
+  end
+  module_function :shellescape
+end

data/fastlane_core/lib/fastlane_core/fastlane_folder.rb

@@ -21,6 +21,7 @@ module FastlaneCore
     end
 
     def self.swift?
+      return false unless self.fastfile_path
       return self.fastfile_path.downcase.end_with?(".swift")
     end
 

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -68,7 +68,9 @@ module Commander
           FastlaneCore::UI.user_error!("fastlane requires a minimum version of Xcode #{Fastlane::MINIMUM_XCODE_RELEASE}, please upgrade and make sure to use `sudo xcode-select -s /Applications/Xcode.app`")
         end
 
-        action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(@program[:name], args: ARGV)
+        is_swift = FastlaneCore::FastlaneFolder.swift?
+        fastlane_client_language = is_swift ? :swift : :ruby
+        action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(@program[:name], fastlane_client_language: fastlane_client_language, args: ARGV)
         FastlaneCore.session.action_launched(launch_context: action_launch_context)
 
         return_value = run_active_command

data/fastlane_core/lib/fastlane_core.rb

@@ -1,6 +1,7 @@
 require_relative 'fastlane_core/globals'
 # Ruby monkey-patches - should be before almost all else
 require_relative 'fastlane_core/core_ext/string'
+require_relative 'fastlane_core/core_ext/shellwords'
 
 require_relative 'fastlane_core/env'
 require_relative 'fastlane_core/feature/feature'

data/produce/lib/produce/commands_generator.rb

@@ -47,6 +47,7 @@ module Produce
 
         c.option('--app-group', 'Enable App Groups')
         c.option('--apple-pay', 'Enable Apple Pay')
+        c.option('--auto-fill-credential', 'Enable AutoFill Credential')
         c.option('--associated-domains', 'Enable Associated Domains')
         c.option('--data-protection STRING', String, 'Enable Data Protection, suitable values are "complete", "unlessopen" and "untilfirstauth"')
         c.option('--game-center', 'Enable Game Center')
@@ -86,6 +87,7 @@ module Produce
 
         c.option('--app-group', 'Disable App Groups')
         c.option('--apple-pay', 'Disable Apple Pay')
+        c.option('--auto-fill-credential', 'Disable AutoFill Credential')
         c.option('--associated-domains', 'Disable Associated Domains')
         c.option('--data-protection', 'Disable Data Protection')
         c.option('--game-center', 'Disable Game Center')

data/produce/lib/produce/developer_center.rb

@@ -15,6 +15,7 @@ module Produce
       app_group: [SERVICE_ON, SERVICE_OFF],
       apple_pay: [SERVICE_ON, SERVICE_OFF],
       associated_domains: [SERVICE_ON, SERVICE_OFF],
+      auto_fill_credential: [SERVICE_ON, SERVICE_OFF],
       data_protection: [
         SERVICE_COMPLETE,
         SERVICE_UNLESS_OPEN,

data/produce/lib/produce/service.rb

@@ -36,7 +36,7 @@ module Produce
     end
 
     def valid_services_for(options)
-      allowed_keys = [:app_group, :apple_pay, :associated_domains, :data_protection, :game_center, :healthkit, :homekit,
+      allowed_keys = [:app_group, :apple_pay, :associated_domains, :auto_fill_credential, :data_protection, :game_center, :healthkit, :homekit,
                       :hotspot, :icloud, :in_app_purchase, :inter_app_audio, :multipath, :network_extension,
                       :nfc_tag_reading, :personal_vpn, :passbook, :push_notification, :sirikit, :vpn_conf,
                       :wallet, :wireless_conf]
@@ -77,6 +77,16 @@ module Produce
         end
       end
 
+      if options.auto_fill_credential
+        UI.message("\tAutoFill Credential")
+
+        if on
+          app.update_service(Spaceship.app_service.auto_fill_credential.on)
+        else
+          app.update_service(Spaceship.app_service.auto_fill_credential.off)
+        end
+      end
+
       if options.data_protection
         UI.message("\tData Protection")
 

data/scan/lib/scan/options.rb

@@ -118,7 +118,7 @@ module Scan
         FastlaneCore::ConfigItem.new(key: :output_style,
                                      short_option: "-b",
                                      env_name: "SCAN_OUTPUT_STYLE",
-                                     description: "Define how the output should look like (standard, basic, rspec or raw)",
+                                     description: "Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty)",
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error!("Invalid output_style #{value}") unless ['standard', 'basic', 'rspec', 'raw'].include?(value)
@@ -151,6 +151,11 @@ module Scan
                                      env_name: "SCAN_FORMATTER",
                                      description: "A custom xcpretty formatter to use",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_args,
+                                     env_name: "SCAN_XCPRETTY_ARGS",
+                                     description: "Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf')",
+                                     type: String,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :max_concurrent_simulators,
                                      type: Integer,
                                      env_name: "SCAN_MAX_CONCURRENT_SIMULATORS",

data/scan/lib/scan/runner.rb

@@ -122,9 +122,10 @@ module Scan
       # We'll have to regenerate from the xcodebuild log, like we did before version 2.34.0.
       UI.message("Generating test results. This may take a while for large projects.")
 
-      reporter_options_generator = XCPrettyReporterOptionsGenerator.new(false, [], [], "", false)
+      reporter_options_generator = XCPrettyReporterOptionsGenerator.new(false, [], [], "", false, nil)
       reporter_options = reporter_options_generator.generate_reporter_options
-      cmd = "cat #{@test_command_generator.xcodebuild_log_path.shellescape} | xcpretty #{reporter_options.join(' ')} &> /dev/null"
+      xcpretty_args_options = reporter_options_generator.generate_xcpretty_args_options
+      cmd = "cat #{@test_command_generator.xcodebuild_log_path.shellescape} | xcpretty #{reporter_options.join(' ')} #{xcpretty_args_options} &> /dev/null"
       system(cmd)
       File.read(Scan.cache[:temp_junit_report])
     end

data/scan/lib/scan/test_command_generator.rb

@@ -111,9 +111,11 @@ module Scan
                                                                          Scan.config[:output_types],
                                                                          Scan.config[:output_files] || Scan.config[:custom_report_file_name],
                                                                          Scan.config[:output_directory],
-                                                                         Scan.config[:use_clang_report_name])
+                                                                         Scan.config[:use_clang_report_name],
+                                                                         Scan.config[:xcpretty_args])
       reporter_options = @reporter_options_generator.generate_reporter_options
-      return pipe << "| xcpretty #{formatter.join(' ')} #{reporter_options.join(' ')}"
+      reporter_xcpretty_args = @reporter_options_generator.generate_xcpretty_args_options
+      return pipe << "| xcpretty #{formatter.join(' ')} #{reporter_options.join(' ')} #{reporter_xcpretty_args}"
     end
 
     # Store the raw file

data/scan/lib/scan/xcpretty_reporter_options_generator.rb

@@ -9,16 +9,18 @@ module Scan
                Scan.config[:output_types],
                Scan.config[:output_files] || Scan.config[:custom_report_file_name],
                Scan.config[:output_directory],
-               Scan.config[:use_clang_report_name])
+               Scan.config[:use_clang_report_name],
+               Scan.config[:xcpretty_args])
     end
 
     # Intialize with values from Scan.config matching these param names
-    def initialize(open_report, output_types, output_files, output_directory, use_clang_report_name)
+    def initialize(open_report, output_types, output_files, output_directory, use_clang_report_name, xcpretty_args)
       @open_report = open_report
       @output_types = output_types
       @output_files = output_files
       @output_directory = output_directory
       @use_clang_report_name = use_clang_report_name
+      @xcpretty_args = xcpretty_args
 
       # might already be an array when passed via fastlane
       @output_types = @output_types.split(',') if @output_types.kind_of?(String)
@@ -64,6 +66,10 @@ module Scan
       return reporter
     end
 
+    def generate_xcpretty_args_options
+      return @xcpretty_args
+    end
+
     private
 
     def determine_output_file_name(type)

data/spaceship/lib/spaceship/du/du_client.rb

@@ -108,6 +108,7 @@ module Spaceship
         iphone6:      "MZPFT.SortedN61ScreenShot",
         iphone6Plus:  "MZPFT.SortedN56ScreenShot",
         iphone58:     "MZPFT.SortedD22ScreenShot",
+        iphone65:     "MZPFT.SortedD33ScreenShot",
         iphone4:      "MZPFT.SortedN41ScreenShot",
         iphone35:     "MZPFT.SortedScreenShot",
         appleTV:      "MZPFT.SortedATVScreenShot",
@@ -124,6 +125,7 @@ module Spaceship
         iphone6:      "MZPFT.SortedN61MessagesScreenShot",
         iphone6Plus:  "MZPFT.SortedN56MessagesScreenShot",
         iphone58:     "MZPFT.SortedD22MessagesScreenShot",
+        iphone65:     "MZPFT.SortedD33MessagesScreenShot",
         iphone4:      "MZPFT.SortedN41MessagesScreenShot"
       }
     end
@@ -137,6 +139,8 @@ module Spaceship
         ipad105:      [[1668, 2224], [2224, 1668]],
         iphone6:      [[750, 1334], [1334, 750]],
         iphone6Plus:  [[1242, 2208], [2208, 1242]],
+        iphone58:     [[1125, 2436], [2436, 1125]],
+        iphone65:     [[1242, 2688], [2688, 1242]],
         iphone4:      [[640, 1096], [640, 1136], [1136, 600], [1136, 640]],
         iphone35:     [[640, 960], [640, 920], [960, 600], [960, 640]],
         appleTV:      [[1920, 1080]],

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -138,6 +138,9 @@ module Spaceship
       # ApplePay certificate
       class ApplePay < Certificate; end
 
+      # ApplePayMerchantIdentity certificate
+      class ApplePayMerchantIdentity < Certificate; end
+
       # A Mac push notification certificate for development environment
       class MacDevelopmentPush < PushCertificate; end
 
@@ -154,7 +157,8 @@ module Spaceship
         "Y3B2F3TYSI" => Passbook,
         "3T2ZP62QW8" => WebsitePush,
         "E5D663CMZW" => VoipPush,
-        "4APLUP237T" => ApplePay
+        "4APLUP237T" => ApplePay,
+        "MD8Q2VRT6A" => ApplePayMerchantIdentity
       }
 
       OLDER_IOS_CERTIFICATE_TYPES = [

data/spaceship/lib/spaceship/test_flight/test_info.rb

@@ -7,7 +7,7 @@ module Spaceship::TestFlight
     # For now, when we set a value it sets the same value for all locales
     # When getting a value, we return the first locale values
 
-    attr_accessor :description, :feedback_email, :whats_new
+    attr_accessor :description, :feedback_email, :whats_new, :privacy_policy_url, :marketing_url
 
     def description
       raw_data.first['description']
@@ -25,6 +25,22 @@ module Spaceship::TestFlight
       raw_data.each { |locale| locale['feedbackEmail'] = value }
     end
 
+    def privacy_policy_url
+      raw_data.first['privacyPolicyUrl']
+    end
+
+    def privacy_policy_url=(value)
+      raw_data.each { |locale| locale['privacyPolicyUrl'] = value }
+    end
+
+    def marketing_url
+      raw_data.first['marketingUrl']
+    end
+
+    def marketing_url=(value)
+      raw_data.each { |locale| locale['marketingUrl'] = value }
+    end
+
     def whats_new
       raw_data.first['whatsNew']
     end

data/spaceship/lib/spaceship/tunes/device_type.rb

@@ -1,7 +1,7 @@
 module Spaceship
   module Tunes
     class DeviceType
-      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'ipad', 'ipadPro', 'ipad105', 'watch', 'appleTV', 'desktop']
+      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'iphone65', 'ipad', 'ipadPro', 'ipad105', 'watch', 'appleTV', 'desktop']
       class << self
         attr_accessor :types