fastlane 2.143.0 → 2.147.0

data/scan/lib/scan/runner.rb

@@ -148,6 +148,8 @@ module Scan
     end
 
     def test_results
+      return if Scan.config[:disable_xcpretty]
+
       temp_junit_report = Scan.cache[:temp_junit_report]
       return File.read(temp_junit_report) if temp_junit_report && File.file?(temp_junit_report)
 

data/scan/lib/scan/test_command_generator.rb

@@ -45,6 +45,9 @@ module Scan
       options << "-enableCodeCoverage #{config[:code_coverage] ? 'YES' : 'NO'}" unless config[:code_coverage].nil?
       options << "-enableAddressSanitizer #{config[:address_sanitizer] ? 'YES' : 'NO'}" unless config[:address_sanitizer].nil?
       options << "-enableThreadSanitizer #{config[:thread_sanitizer] ? 'YES' : 'NO'}" unless config[:thread_sanitizer].nil?
+      if FastlaneCore::Helper.xcode_at_least?(11)
+        options << "-testPlan '#{config[:testplan]}'" if config[:testplan]
+      end
       options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]
 
@@ -82,7 +85,7 @@ module Scan
     def pipe
       pipe = ["| tee '#{xcodebuild_log_path}'"]
 
-      if Scan.config[:output_style] == 'raw'
+      if Scan.config[:disable_xcpretty] || Scan.config[:output_style] == 'raw'
         return pipe
       end
 

data/screengrab/lib/screengrab/runner.rb

@@ -63,7 +63,7 @@ module Screengrab
 
       # Root is needed to access device paths at /data
       if @config[:use_adb_root]
-        run_adb_command("root", print_all: false, print_command: true)
+        run_adb_command("-s #{device_serial} root", print_all: false, print_command: true)
       end
 
       clear_device_previous_screenshots(device_serial, device_screenshots_paths)

data/snapshot/lib/assets/SnapfileTemplate

@@ -27,6 +27,9 @@
 # remove the '#' to clear all previously generated screenshots before creating new ones
 # clear_previous_screenshots(true)
 
+# Remove the '#' to set the status bar to 9:41 AM, and show full battery and reception.
+# override_status_bar(true)
+
 # Arguments to pass to the app on launch. See https://docs.fastlane.tools/actions/snapshot/#launch-arguments
 # launch_arguments(["-favColor red"])
 

data/snapshot/lib/snapshot/options.rb

@@ -111,6 +111,11 @@ module Snapshot
                                      description: "Enabling this option will automatically erase the simulator before running the application",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :override_status_bar,
+                                     env_name: 'SNAPSHOT_OVERRIDE_STATUS_BAR',
+                                     description: "Enabling this option wil automatically override the status bar to show 9:41 AM, full battery, and full reception",
+                                     default_value: false,
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :localize_simulator,
                                      env_name: 'SNAPSHOT_LOCALIZE_SIMULATOR',
                                      description: "Enabling this option will configure the Simulator's system language",
@@ -232,6 +237,11 @@ module Snapshot
                                      env_name: "SNAPSHOT_CLONED_SOURCE_PACKAGES_PATH",
                                      description: "Sets a custom path for Swift Package Manager dependencies",
                                      type: String,
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :testplan,
+                                     env_name: "SNAPSHOT_TESTPLAN",
+                                     description: "The testplan associated with the scheme that should be used for testing",
+                                     is_string: true,
                                      optional: true)
       ]
     end

data/snapshot/lib/snapshot/reports_generator.rb

@@ -97,13 +97,17 @@ module Snapshot
         'iPhone SE' => "iPhone SE",
         'iPhone 4s' => "iPhone 4s (3.5-Inch)",
         'iPad 2' => 'iPad 2',
+        'iPad Air (3rd generation)' => 'iPad Air (3rd generation)',
         'iPad Air 2' => 'iPad Air 2',
         'iPad Air' => 'iPad Air',
         'iPad (5th generation)' => 'iPad (5th generation)',
+        'iPad (7th generation)' => 'iPad (7th generation)',
         'iPad Pro (9.7-inch)' => 'iPad Pro (9.7-inch)',
         'iPad Pro (9.7 inch)' => 'iPad Pro (9.7-inch)', # iOS 10.3.1 simulator
         'iPad Pro (10.5-inch)' => 'iPad Pro (10.5-inch)',
+        'iPad Pro (11-inch) (2nd generation)' => 'iPad Pro (11-inch) (2nd generation)',
         'iPad Pro (11-inch)' => 'iPad Pro (11-inch)',
+        'iPad Pro (12.9-inch) (4th generation)' => 'iPad Pro (12.9-inch) (4th generation)',
         'iPad Pro (12.9-inch) (3rd generation)' => 'iPad Pro (12.9-inch) (3rd generation)',
         'iPad Pro (12.9-inch) (2nd generation)' => 'iPad Pro (12.9-inch) (2nd generation)',
         'iPad Pro (12.9-inch)' => 'iPad Pro (12.9-inch)',

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -12,6 +12,7 @@ module Snapshot
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
     attr_accessor :disable_slide_to_type
+    attr_accessor :override_status_bar
 
     # xcode 8
     attr_accessor :number_of_retries
@@ -43,6 +44,7 @@ module Snapshot
       @output_directory = snapshot_config[:output_directory]
       @concurrent_simulators = snapshot_config[:concurrent_simulators]
       @disable_slide_to_type = snapshot_config[:disable_slide_to_type]
+      @override_status_bar = snapshot_config[:override_status_bar]
 
       launch_arguments = Array(snapshot_config[:launch_arguments])
       # if more than 1 set of arguments, use a tuple with an index

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -89,10 +89,14 @@ module Snapshot
         log_path: xcodebuild_log_path(language: language, locale: locale)
       )
 
+      devices.each { |device_type| override_status_bar(device_type) } if launcher_config.override_status_bar
+
       UI.important("Running snapshot on: #{devices.join(', ')}")
 
       execute(command: command, language: language, locale: locale, launch_args: launch_arguments, devices: devices)
 
+      devices.each { |device_type| clear_status_bar(device_type) } if launcher_config.override_status_bar
+
       return copy_screenshots(language: language, locale: locale, launch_args: launch_arguments)
     end
 

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -1,4 +1,5 @@
 require 'plist'
+require 'time'
 
 require_relative '../module'
 require_relative '../test_command_generator'
@@ -102,6 +103,26 @@ module Snapshot
       end
     end
 
+    def override_status_bar(device_type)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+
+      UI.message("Launch Simulator #{device_type}")
+      Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+
+      UI.message("Overriding Status Bar")
+
+      # The time needs to be passed as ISO8601 so the simulator formats it correctly
+      time = Time.new(2007, 1, 9, 9, 41, 0)
+      Helper.backticks("xcrun simctl status_bar #{device_udid} override --time #{time.iso8601} --dataNetwork wifi --wifiMode active --wifiBars 3 --cellularMode active --cellularBars 4 --batteryState charged --batteryLevel 100 &> /dev/null")
+    end
+
+    def clear_status_bar(device_type)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+
+      UI.message("Clearing Status Bar Override")
+      Helper.backticks("xcrun simctl status_bar #{device_udid} clear &> /dev/null")
+    end
+
     def uninstall_app(device_type)
       launcher_config.app_identifier ||= UI.input("App Identifier: ")
       device_udid = TestCommandGenerator.device_udid(device_type)

data/snapshot/lib/snapshot/test_command_generator_base.rb

@@ -26,6 +26,9 @@ module Snapshot
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
         options << "-derivedDataPath '#{derived_data_path}'"
         options << "-resultBundlePath '#{result_bundle_path}'" if result_bundle_path
+        if FastlaneCore::Helper.xcode_at_least?(11)
+          options << "-testPlan '#{config[:testplan]}'" if config[:testplan]
+        end
         options << config[:xcargs] if config[:xcargs]
         return options
       end

data/spaceship/lib/spaceship/base.rb

@@ -295,7 +295,7 @@ module Spaceship
     def inspect_value
       self.attributes.map do |k|
         v = self.send(k).inspect
-        v.gsub!("\n", "\n\t") # to align nested elements
+        v = v.gsub("\n", "\n\t") # to align nested elements
 
         "\t#{k}=#{v}"
       end.join(", \n")

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -49,6 +49,12 @@ module Spaceship
           alias_method(key_writer, writer)
         end
       end
+
+      def to_json(*options)
+        instance_variables.map do |var|
+          [var.to_s[1..-1], instance_variable_get(var)]
+        end.to_h.to_json(*options)
+      end
     end
 
     module Models

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -103,6 +103,17 @@ module Spaceship
         resps = Spaceship::ConnectAPI.get_beta_groups(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
+
+      def create_beta_group(group_name: nil, public_link_enabled: false, public_link_limit: 10_000, public_link_limit_enabled: false)
+        resps = Spaceship::ConnectAPI.create_beta_group(
+          app_id: id,
+          group_name: group_name,
+          public_link_enabled: public_link_enabled,
+          public_link_limit: public_link_limit,
+          public_link_limit_enabled: public_link_limit_enabled
+        ).all_pages
+        return resps.flat_map(&:to_models).first
+      end
     end
   end
 end

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -181,6 +181,29 @@ module Spaceship
         Client.instance.post("builds/#{build_id}/relationships/betaGroups", body)
       end
 
+      def create_beta_group(app_id: nil, group_name: nil, public_link_enabled: false, public_link_limit: 10_000, public_link_limit_enabled: false)
+        body = {
+          data: {
+            attributes: {
+              name: group_name,
+              publicLinkEnabled: public_link_enabled,
+              publicLinkLimit: public_link_limit,
+              publicLinkLimitEnabled: public_link_limit_enabled
+            },
+            relationships: {
+              app: {
+                data: {
+                  id: app_id,
+                  type: "apps"
+                }
+              }
+            },
+            type: "betaGroups"
+          }
+        }
+        Client.instance.post("betaGroups", body)
+      end
+
       #
       # betaTesters
       #

data/spaceship/lib/spaceship/portal/app_service.rb

@@ -59,11 +59,11 @@ module Spaceship
       NetworkExtension = AppService.new_service("NWEXT04537")
       NFCTagReading = AppService.new_service("NFCTRMAY17")
       PersonalVPN = AppService.new_service("V66P55NK2I")
-      Passbook = AppService.new_service("pass")
+      Passbook = AppService.new_service("passbook")
       PushNotification = AppService.new_service("push")
       SiriKit = AppService.new_service("SI015DKUHP")
       VPNConfiguration = AppService.new_service("V66P55NK2I")
-      Wallet = AppService.new_service("pass")
+      Wallet = AppService.new_service("passbook")
       WirelessAccessory = AppService.new_service("WC421J6T7P")
 
       constants.each do |c|

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -100,6 +100,19 @@ module Spaceship
     end
     private :platform_slug
 
+    def list_pending_agreements(language: "en")
+      r = request(:post) do |req|
+        req.url("account/listPendingAgreements")
+        req.body = {
+          teamId: team_id,
+          languageIsoCode: language
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+
+      return parse_response(r)
+    end
+
     #####################################################
     # @!group Apps
     #####################################################

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -767,14 +767,19 @@ module Spaceship
       end
 
       def setup_screenshots
-        # Enable Scaling for all screen sizes that don't have at least one screenshot
+        # Enable Scaling for all screen sizes that don't have at least one screenshot or at least one trailer (app_preview)
         # We automatically disable scaling once we upload at least one screenshot
         language_details = raw_data_details.each do |current_language|
           language_details = (current_language["displayFamilies"] || {})["value"]
           (language_details || []).each do |device_language_details|
+            # Do not enable scaling if a screenshot already exists
             next if device_language_details["screenshots"].nil?
             next if device_language_details["screenshots"]["value"].count > 0
 
+            # Do not enable scaling if a trailer already exists
+            next if device_language_details["trailers"].nil?
+            next if device_language_details["trailers"]["value"].count > 0
+
             # The current row includes screenshots for all device types
             # so we need to enable scaling for both iOS and watchOS apps
             device_language_details["scaled"]["value"] = true if device_language_details["scaled"]

data/spaceship/lib/spaceship/tunes/application.rb

@@ -91,7 +91,7 @@ module Spaceship
         # @param platform (String): Platform one of (ios,osx)
         #  should it be an ios or an osx app
 
-        def create!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, itunes_connect_users: nil)
+        def create!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, platforms: nil, itunes_connect_users: nil)
           puts("The `version` parameter is deprecated. Use `ensure_version!` method instead") if version
           client.create_application!(name: name,
                          primary_language: primary_language,
@@ -100,6 +100,7 @@ module Spaceship
                                 bundle_id_suffix: bundle_id_suffix,
                                 company_name: company_name,
                                     platform: platform,
+                                    platforms: platforms,
                                     itunes_connect_users: itunes_connect_users)
         end
 

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -132,6 +132,21 @@ module Spaceship
         return nil
       end
 
+      # generate app-specific shared secret (or regenerate if exists)
+      def generate_shared_secret
+        client.generate_shared_secret(app_id: self.application.apple_id)
+      end
+
+      # retrieve app-specific shared secret
+      # @param create (Boolean) Create new shared secret if does not exist
+      def get_shared_secret(create: false)
+        secret = client.get_shared_secret(app_id: self.application.apple_id)
+        if create && secret.nil?
+          secret = generate_shared_secret
+        end
+        secret
+      end
+
       private
 
       def find_product_with_retries(product_id, max_tries)

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -286,7 +286,7 @@ module Spaceship
     # @param sku (String): A unique ID for your app that is not visible on the App Store.
     # @param bundle_id (String): The bundle ID must match the one you used in Xcode. It
     #   can't be changed after you submit your first build.
-    def create_application!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, itunes_connect_users: nil)
+    def create_application!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, platforms: nil, itunes_connect_users: nil)
       puts("The `version` parameter is deprecated. Use `Spaceship::Tunes::Application.ensure_version!` method instead") if version
 
       # First, we need to fetch the data from Apple, which we then modify with the user's values
@@ -307,7 +307,7 @@ module Spaceship
       data['enabledPlatformsForCreation'] = { value: [platform] }
 
       data['initialPlatform'] = platform
-      data['enabledPlatformsForCreation'] = { value: [platform] }
+      data['enabledPlatformsForCreation'] = { value: platforms || [platform] }
 
       unless itunes_connect_users.nil?
         data['iTunesConnectUsers']['grantedAllUsers'] = false
@@ -1422,6 +1422,20 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
+    # Retrieves app-specific shared secret key
+    def get_shared_secret(app_id: nil)
+      r = request(:get, "ra/apps/#{app_id}/iaps/appSharedSecret")
+      data = parse_response(r, 'data')
+      data['sharedSecret']
+    end
+
+    # Generates app-specific shared secret key
+    def generate_shared_secret(app_id: nil)
+      r = request(:post, "ra/apps/#{app_id}/iaps/appSharedSecret")
+      data = parse_response(r, 'data')
+      data['sharedSecret']
+    end
+
     #####################################################
     # @!group Sandbox Testers
     #####################################################

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -131,18 +131,33 @@ module Spaceship
         puts("Environment variable `SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER` is set, automatically requesting 2FA token via SMS to that number")
         puts("SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER = #{env_2fa_sms_default_phone_number}")
         puts("")
+
         phone_number = env_2fa_sms_default_phone_number
         phone_id = phone_id_from_number(response.body["trustedPhoneNumbers"], phone_number)
+        # don't request sms if no trusted devices and env default is the only trusted number,
+        # code was automatically sent
+        should_request_code = !sms_automatically_sent(response)
+        code_type = 'phone'
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code)
+      elsif sms_automatically_sent(response) # sms fallback, code was automatically sent
+        fallback_number = response.body["trustedPhoneNumbers"].first
+        phone_number = fallback_number["numberWithDialCode"]
+        phone_id = fallback_number["id"]
+
+        code_type = 'phone'
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, false)
+      elsif sms_fallback(response) # sms fallback but code wasn't sent bec > 1 phone number
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length)
+        body = request_two_factor_code_from_phone_choose(response.body["trustedPhoneNumbers"], code_length)
       else
         puts("(Input `sms` to escape this prompt and select a trusted phone number to send the code as a text message)")
         puts("")
         puts("(You can also set the environment variable `SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER` to automate this)")
-        puts("(Read more at: https://github.com/fastlane/fastlane/blob/master/spaceship/docs/Authentication.md#auto-select-sms-via-spaceship-2fa-sms-default-phone-number)")
+        puts("(Read more at: https://github.com/fastlane/fastlane/blob/master/spaceship/docs/Authentication.md#auto-select-sms-via-spaceship_2fa_sms_default_phone_number)")
         puts("")
-        code_type = 'trusteddevice'
+
         code = ask_for_2fa_code("Please enter the #{code_length} digit code:")
+        code_type = 'trusteddevice'
         body = { "securityCode" => { "code" => code.to_s } }.to_json
 
         # User exited by entering `sms` and wants to choose phone number for SMS
@@ -191,11 +206,30 @@ module Spaceship
       return true
     end
 
+    # For reference in case auth behavior changes:
+    # The "noTrustedDevices" field is only present
+    # in the response for `GET /appleauth/auth`
+
+    # Account is not signed into any devices that can display a verification code
+    def sms_fallback(response)
+      response.body["noTrustedDevices"]
+    end
+
+    # see `sms_fallback` + account has only one trusted number for receiving an sms
+    def sms_automatically_sent(response)
+      (response.body["trustedPhoneNumbers"] || []).count == 1 && sms_fallback(response)
+    end
+
     # extracted into its own method for testing
     def ask_for_2fa_code(text)
       ask(text)
     end
 
+    # extracted into its own method for testing
+    def choose_phone_number(opts)
+      choose(*opts)
+    end
+
     def phone_id_from_number(phone_numbers, phone_number)
       characters_to_remove_from_phone_numbers = ' \-()"'
 
@@ -247,27 +281,29 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
       available = phone_numbers.collect do |current|
         current['numberWithDialCode']
       end
-      chosen = choose(*available)
+      chosen = choose_phone_number(available)
       phone_id = phone_id_from_masked_number(phone_numbers, chosen)
 
       request_two_factor_code_from_phone(phone_id, chosen, code_length)
     end
 
     # this is used in two places: after choosing a phone number and when a phone number is set via ENV var
-    def request_two_factor_code_from_phone(phone_id, phone_number, code_length)
-      # Request code
-      r = request(:put) do |req|
-        req.url("https://idmsa.apple.com/appleauth/auth/verify/phone")
-        req.headers['Content-Type'] = 'application/json'
-        req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
-        update_request_headers(req)
-      end
+    def request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code = true)
+      if should_request_code
+        # Request code
+        r = request(:put) do |req|
+          req.url("https://idmsa.apple.com/appleauth/auth/verify/phone")
+          req.headers['Content-Type'] = 'application/json'
+          req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+          update_request_headers(req)
+        end
 
-      # we use `Spaceship::TunesClient.new.handle_itc_response`
-      # since this might be from the Dev Portal, but for 2 step
-      Spaceship::TunesClient.new.handle_itc_response(r.body)
+        # we use `Spaceship::TunesClient.new.handle_itc_response`
+        # since this might be from the Dev Portal, but for 2 step
+        Spaceship::TunesClient.new.handle_itc_response(r.body)
 
-      puts("Successfully requested text message to #{phone_number}")
+        puts("Successfully requested text message to #{phone_number}")
+      end
 
       code = ask_for_2fa_code("Please enter the #{code_length} digit code you received at #{phone_number}:")