fastlane 2.142.0 → 2.146.1

data/pilot/lib/pilot/build_manager.rb

@@ -118,9 +118,17 @@ module Pilot
 
       # Get latest uploaded build if no build specified
       if build.nil?
-        UI.important("No build specified - fetching latest build")
+        app_version = config[:app_version]
+        build_number = config[:build_number]
+        if build_number.nil?
+          if app_version.nil?
+            UI.important("No build specified - fetching latest build")
+          else
+            UI.important("No build specified - fetching latest build for version #{app_version}")
+          end
+        end
         platform = Spaceship::ConnectAPI::Platform.map(fetch_app_platform)
-        build ||= Spaceship::ConnectAPI::Build.all(app_id: app.id, sort: "-uploadedDate", platform: platform, limit: 1).first
+        build ||= Spaceship::ConnectAPI::Build.all(app_id: app.id, version: app_version, build_number: build_number, sort: "-uploadedDate", platform: platform, limit: 1).first
       end
 
       # Verify the build has all the includes that we need
@@ -207,8 +215,11 @@ module Pilot
     end
 
     def update_beta_app_meta(options, build)
-      # Setting account required wth AppStore Connect API
-      update_review_detail(build, { demo_account_required: options[:demo_account_required] })
+      # If demo_account_required is a parameter, it should added into beta_app_review_info
+      unless options[:demo_account_required].nil?
+        options[:beta_app_review_info] = {} if options[:beta_app_review_info].nil?
+        options[:beta_app_review_info][:demo_account_required] = options[:demo_account_required]
+      end
 
       if should_update_beta_app_review_info(options)
         update_review_detail(build, options[:beta_app_review_info])

data/pilot/lib/pilot/options.rb

@@ -162,6 +162,14 @@ module Pilot
                                     env_name: "PILOT_NOTIFY_EXTERNAL_TESTERS",
                                     description: "Should notify external testers?",
                                     default_value: true),
+        FastlaneCore::ConfigItem.new(key: :app_version,
+                                     env_name: "PILOT_APP_VERSION",
+                                     description: "The version number of the application build to distribute. If the version number is not specified, then the most recent build uploaded to TestFlight will be distributed. If specified, the most recent build for the version number will be distributed",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :build_number,
+                                     env_name: "PILOT_BUILD_NUMBER",
+                                     description: "The build number of the application build to distribute. If the build number is not specified, the most recent build is distributed",
+                                     optional: true),
 
         # testers
         FastlaneCore::ConfigItem.new(key: :first_name,

data/produce/lib/produce/developer_center.rb

@@ -59,7 +59,7 @@ module Produce
         app = Spaceship.app.create!(bundle_id: app_identifier,
                                          name: app_name,
                                          enable_services: enable_services,
-                                         mac: Produce.config[:platform] == "osx")
+                                         mac: platform == "osx")
 
         if app.name != Produce.config[:app_name]
           UI.important("Your app name includes non-ASCII characters, which are not supported by the Apple Developer Portal.")
@@ -122,8 +122,17 @@ module Produce
 
     private
 
+    def platform
+      # This was added to support creation of multiple platforms
+      # Produce::ItunesConnect can take an array of platforms to create for App Store Connect
+      # but the Developer Center is now platform agnostic so we choose any platform here
+      #
+      # Platform won't be needed at all in the future when this is change over to use Spaceship::ConnectAPI
+      (Produce.config[:platforms] || []).first || Produce.config[:platform]
+    end
+
     def app_exists?
-      Spaceship.app.find(app_identifier, mac: Produce.config[:platform] == "osx") != nil
+      Spaceship.app.find(app_identifier, mac: platform == "osx") != nil
     end
 
     def login

data/produce/lib/produce/itunes_connect.rb

@@ -23,6 +23,8 @@ module Produce
       else
         UI.success("Creating new app '#{Produce.config[:app_name]}' on App Store Connect")
 
+        platforms = Produce.config[:platforms] || [Produce.config[:platform]]
+
         Produce.config[:bundle_identifier_suffix] = '' unless wildcard_bundle?
         generated_app = Spaceship::Tunes::Application.create!(name: Produce.config[:app_name],
                                                               primary_language: language,
@@ -30,7 +32,7 @@ module Produce
                                                               bundle_id: app_identifier,
                                                               bundle_id_suffix: Produce.config[:bundle_identifier_suffix],
                                                               company_name: Produce.config[:company_name],
-                                                              platform: Produce.config[:platform],
+                                                              platforms: platforms,
                                                               itunes_connect_users: Produce.config[:itc_users])
 
         UI.crash!("Something went wrong when creating the new app on iTC") if generated_app["adamId"].to_s.empty?
@@ -51,16 +53,22 @@ module Produce
         UI.crash!("Something went wrong when creating the new app - it's not listed in the App's list") unless application
 
         UI.message("Ensuring version number")
-        application.ensure_version!(Produce.config[:app_version], platform: Produce.config[:platform]) if Produce.config[:app_version]
+        platforms.each do |platform|
+          application.ensure_version!(Produce.config[:app_version], platform: platform) if Produce.config[:app_version]
+        end
 
         UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.apple_id}")
       end
 
-      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: Produce.config[:platform] == "osx").apple_id
+      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: platform == "osx").apple_id
     end
 
     private
 
+    def platform
+      (Produce.config[:platforms] || []).first || Produce.config[:platform]
+    end
+
     def fetch_application
       Spaceship::Tunes::Application.find(@full_bundle_identifier)
     end

data/produce/lib/produce/options.rb

@@ -50,11 +50,23 @@ module Produce
                                      short_option: "-j",
                                      env_name: "PRODUCE_PLATFORM",
                                      description: "The platform to use (optional)",
+                                     conflicting_options: [:platforms],
                                      optional: true,
                                      default_value: "ios",
                                      verify_block: proc do |value|
                                                      UI.user_error!("The platform can only be ios or osx") unless %('ios', 'osx').include?(value)
                                                    end),
+        FastlaneCore::ConfigItem.new(key: :platforms,
+                                     short_option: "-J",
+                                     env_name: "PRODUCE_PLATFORMS",
+                                     description: "The platforms to use (optional)",
+                                     conflicting_options: [:platform],
+                                     optional: true,
+                                     type: Array,
+                                     verify_block: proc do |values|
+                                                     types = %w(ios osx)
+                                                     UI.user_error!("The platform can only be #{types}") unless (values - types).empty?
+                                                   end),
         FastlaneCore::ConfigItem.new(key: :language,
                                      short_option: "-m",
                                      env_name: "PRODUCE_LANGUAGE",

data/scan/lib/scan/options.rb

@@ -124,6 +124,11 @@ module Scan
                                      end),
 
         # other test options
+        FastlaneCore::ConfigItem.new(key: :testplan,
+                                     env_name: "SCAN_TESTPLAN",
+                                     description: "The testplan associated with the scheme that should be used for testing",
+                                     is_string: true,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :xctestrun,
                                      short_option: "-X",
                                      env_name: "SCAN_XCTESTRUN",

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]
 
@@ -151,7 +154,8 @@ module Scan
 
     def result_bundle_path
       unless Scan.cache[:result_bundle_path]
-        path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + ".test_result"
+        ext = FastlaneCore::Helper.xcode_version.to_i >= 11 ? '.xcresult' : '.test_result'
+        path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + ext
         if File.directory?(path)
           FileUtils.remove_dir(path)
         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)
@@ -143,10 +143,17 @@ module Screengrab
 
     def determine_internal_screenshots_paths(app_package_name, locales)
       locale_paths = locales.map do |locale|
-        "/data/user/0/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots"
-      end
+        [
+          "/data/user/0/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots",
+
+          # https://github.com/fastlane/fastlane/issues/15653#issuecomment-578541663
+          "/data/data/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots"
+        ]
+      end.flatten
 
-      return ["/data/data/#{app_package_name}/app_screengrab"] + locale_paths
+      return ["/data/data/#{app_package_name}/app_screengrab"] +
+             ["/data/data/#{app_package_name}/screengrab"] +
+             locale_paths
     end
 
     def clear_device_previous_screenshots(device_serial, device_screenshots_paths)
@@ -289,6 +296,7 @@ module Screengrab
       Dir.mktmpdir do |tempdir|
         device_screenshots_paths.each do |device_path|
           if_device_path_exists(device_serial, device_path) do |path|
+            next unless path.include?(locale)
             run_adb_command("-s #{device_serial} pull #{path} #{tempdir}",
                             print_all: false,
                             print_command: true)

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/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/models/build.rb

@@ -79,8 +79,7 @@ module Spaceship
       end
 
       def ready_for_internal_testing?
-        raise "No build_beta_detail included" unless build_beta_detail
-        return build_beta_detail.ready_for_internal_testing?
+        return build_beta_detail.nil? == false && build_beta_detail.ready_for_internal_testing?
       end
 
       def ready_for_beta_submission?

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

@@ -22,6 +22,8 @@ module Spaceship
       })
 
       module CertificateType
+        DEVELOPMENT = "DEVELOPMENT"
+        DISTRIBUTION = "DISTRIBUTION"
         IOS_DEVELOPMENT = "IOS_DEVELOPMENT"
         IOS_DISTRIBUTION = "IOS_DISTRIBUTION"
         MAC_APP_DISTRIBUTION = "MAC_APP_DISTRIBUTION"

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/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

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}:")