fastlane 2.147.0 → 2.150.0.rc1

data/match/lib/match/options.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/configuration/config_item'
+require 'fastlane/helper/lane_helper'
 require 'credentials_manager/appfile_config'
 require_relative 'module'
 
@@ -10,6 +11,15 @@ module Match
       @available_options << option
     end
 
+    def self.default_platform
+      case Fastlane::Helper::LaneHelper.current_platform.to_s
+      when "mac"
+        "macos"
+      else
+        "ios"
+      end
+    end
+
     def self.available_options
       user = CredentialsManager::AppfileConfig.try_fetch_value(:apple_dev_portal_id)
       user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
@@ -215,7 +225,8 @@ module Match
                                      short_option: '-o',
                                      env_name: "MATCH_PLATFORM",
                                      description: "Set the provisioning profile's platform to work with (i.e. ios, tvos, macos)",
-                                     default_value: "ios",
+                                     default_value: default_platform,
+                                     default_value_dynamic: true,
                                      verify_block: proc do |value|
                                        value = value.to_s
                                        pt = %w(tvos ios macos)
@@ -231,6 +242,12 @@ module Match
                                     description: "A custom name for the provisioning profile. This will replace the default provisioning profile name if specified",
                                     optional: true,
                                     default_value: nil),
+        FastlaneCore::ConfigItem.new(key: :fail_on_name_taken,
+                                     env_name: "MATCH_FAIL_ON_NAME_TAKEN",
+                                     description: "Should the command fail if it was about to create a duplicate of an existing provisioning profile. It can happen due to issues on Apple Developer Portal, when profile to be recreated was not properly deleted first",
+                                     optional: true,
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :output_path,
                                      env_name: "MATCH_OUTPUT_PATH",
                                      description: "Path in which to export certificates, key and profile",

data/match/lib/match/storage/git_storage.rb

@@ -152,6 +152,10 @@ module Match
         return "git_url(\"#{url}\")"
       end
 
+      def list_files(file_name: "", file_ext: "")
+        Dir[File.join(working_directory, "**", file_name, "*.#{file_ext}")]
+      end
+
       private
 
       # Create and checkout an specific branch in the git repo

data/match/lib/match/storage/google_cloud_storage.rb

@@ -180,6 +180,10 @@ module Match
         false
       end
 
+      def list_files(file_name: "", file_ext: "")
+        Dir[File.join(working_directory, self.team_id, "**", file_name, "*.#{file_ext}")]
+      end
+
       def generate_matchfile_content
         return "google_cloud_bucket_name(\"#{self.bucket_name}\")"
       end

data/match/lib/match/storage/interface.rb

@@ -96,6 +96,10 @@ module Match
         not_implemented(__method__)
       end
 
+      def list_files(file_name: "", file_ext: "")
+        not_implemented(__method__)
+      end
+
       # Implement this for the `fastlane match init` command
       # This method must return the content of the Matchfile
       # that should be generated

data/match/lib/match/storage/s3_storage.rb

@@ -139,6 +139,10 @@ module Match
         false
       end
 
+      def list_files(file_name: "", file_ext: "")
+        Dir[File.join(working_directory, self.team_id, "**", file_name, "*.#{file_ext}")]
+      end
+
       # Implement this for the `fastlane match init` command
       # This method must return the content of the Matchfile
       # that should be generated

data/pem/lib/pem/commands_generator.rb

@@ -25,6 +25,7 @@ module PEM
       program :help_formatter, :compact
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       command :renew do |c|
         c.syntax = 'fastlane pem renew'

data/pilot/lib/pilot/build_manager.rb

@@ -154,13 +154,11 @@ module Pilot
 
       return if config[:skip_submission]
       if options[:reject_build_waiting_for_review]
-        waiting_for_review_build = build.app.get_builds(filter: { "betaAppReviewSubmission.betaReviewState" => "WAITING_FOR_REVIEW" }, includes: "betaAppReviewSubmission,preReleaseVersion").first
-        unless waiting_for_review_build.nil?
-          UI.important("Another build is already in review. Going to remove that build and submit the new one.")
-          UI.important("Deleting beta app review submission for build: #{waiting_for_review_build.app_version} - #{waiting_for_review_build.version}")
-          waiting_for_review_build.beta_app_review_submission.delete!
-          UI.success("Deleted beta app review submission for previous build: #{waiting_for_review_build.app_version} - #{waiting_for_review_build.version}")
-        end
+        reject_build_waiting_for_review(build)
+      end
+
+      if options[:expire_previous_builds]
+        expire_previous_builds(build)
       end
 
       if !build.ready_for_internal_testing? && options[:skip_waiting_for_build_processing]
@@ -318,6 +316,24 @@ module Pilot
       !options[:localized_build_info].nil?
     end
 
+    def reject_build_waiting_for_review(build)
+      waiting_for_review_build = build.app.get_builds(filter: { "betaAppReviewSubmission.betaReviewState" => "WAITING_FOR_REVIEW" }, includes: "betaAppReviewSubmission,preReleaseVersion").first
+      unless waiting_for_review_build.nil?
+        UI.important("Another build is already in review. Going to remove that build and submit the new one.")
+        UI.important("Deleting beta app review submission for build: #{waiting_for_review_build.app_version} - #{waiting_for_review_build.version}")
+        waiting_for_review_build.beta_app_review_submission.delete!
+        UI.success("Deleted beta app review submission for previous build: #{waiting_for_review_build.app_version} - #{waiting_for_review_build.version}")
+      end
+    end
+
+    def expire_previous_builds(build)
+      builds_to_expire = build.app.get_builds.reject do |asc_build|
+        asc_build.id == build.id
+      end
+
+      builds_to_expire.each(&:expire!)
+    end
+
     # If itc_provider was explicitly specified, use it.
     # If there are multiple teams, infer the provider from the selected team name.
     # If there are fewer than two teams, don't infer the provider.

data/pilot/lib/pilot/options.rb

@@ -170,6 +170,11 @@ module Pilot
                                      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),
+        FastlaneCore::ConfigItem.new(key: :expire_previous_builds,
+                                     is_string: false,
+                                     env_name: "PILOT_EXPIRE_PREVIOUS_BUILDS",
+                                     description: "Should expire previous builds?",
+                                     default_value: false),
 
         # testers
         FastlaneCore::ConfigItem.new(key: :first_name,

data/produce/lib/produce/commands_generator.rb

@@ -26,6 +26,7 @@ module Produce
       program :help_formatter, :compact
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       command :create do |c|
         c.syntax = 'fastlane produce create'

data/produce/lib/produce/itunes_connect.rb

@@ -1,7 +1,7 @@
 require 'spaceship'
 require 'spaceship/tunes/tunes'
+require 'fastlane_core/languages'
 require_relative 'module'
-require_relative 'available_default_languages'
 
 module Produce
   class ItunesConnect
@@ -18,24 +18,27 @@ module Produce
     def create_new_app
       application = fetch_application
       if application
-        UI.success("App '#{Produce.config[:app_identifier]}' already exists (#{application.apple_id}), nothing to do on App Store Connect")
+        UI.success("App '#{Produce.config[:app_identifier]}' already exists (#{application.id}), nothing to do on App Store Connect")
         # Nothing to do here
       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,
-                                                              sku: Produce.config[:sku].to_s, # might be an int
-                                                              bundle_id: app_identifier,
-                                                              bundle_id_suffix: Produce.config[:bundle_identifier_suffix],
-                                                              company_name: Produce.config[:company_name],
-                                                              platforms: platforms,
-                                                              itunes_connect_users: Produce.config[:itc_users])
+        platforms = platforms.map do |platform|
+          Spaceship::ConnectAPI::Platform.map(platform)
+        end
 
-        UI.crash!("Something went wrong when creating the new app on iTC") if generated_app["adamId"].to_s.empty?
+        # Produce.config[:company_name]
+        # Produce.config[:itc_users]
+        application = Spaceship::ConnectAPI::App.create(
+          name: Produce.config[:app_name],
+          version_string: Produce.config[:app_version] || "1.0",
+          sku: Produce.config[:sku].to_s,
+          primary_locale: language,
+          bundle_id: app_identifier,
+          platforms: platforms
+        )
 
         application = fetch_application
         counter = 0
@@ -57,10 +60,10 @@ module Produce
           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}")
+        UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.id}")
       end
 
-      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: platform == "osx").apple_id
+      return application.id
     end
 
     private
@@ -70,7 +73,7 @@ module Produce
     end
 
     def fetch_application
-      Spaceship::Tunes::Application.find(@full_bundle_identifier)
+      Spaceship::ConnectAPI::App.find(@full_bundle_identifier)
     end
 
     def wildcard_bundle?
@@ -87,11 +90,8 @@ module Produce
     def language
       @language = Produce.config[:language]
 
-      converted = Spaceship::Tunes::LanguageConverter.from_itc_readable_to_itc(@language)
-      @language = converted if converted # overwrite it with the actual value
-
-      unless AvailableDefaultLanguages.all_languages.include?(@language)
-        UI.user_error!("Please enter one of available languages: #{AvailableDefaultLanguages.all_languages}")
+      unless FastlaneCore::Languages::ALL_LANGUAGES.include?(@language)
+        UI.user_error!("Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}")
       end
 
       return @language

data/produce/lib/produce/options.rb

@@ -54,7 +54,7 @@ module Produce
                                      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)
+                                                     UI.user_error!("The platform can only be ios or osx") unless %('ios', 'osx', 'tvos').include?(value)
                                                    end),
         FastlaneCore::ConfigItem.new(key: :platforms,
                                      short_option: "-J",
@@ -64,13 +64,13 @@ module Produce
                                      optional: true,
                                      type: Array,
                                      verify_block: proc do |values|
-                                                     types = %w(ios osx)
+                                                     types = %w(ios osx tvos)
                                                      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",
-                                     description: "Primary Language (e.g. 'English', 'German')",
+                                     description: "Primary Language (e.g. 'en-US', 'fr-FR')",
                                      default_value: "English",
                                      verify_block: proc do |language|
                                      end),

data/scan/lib/scan/detect_values.rb

@@ -45,6 +45,9 @@ module Scan
       coerce_to_array_of_strings(:only_testing)
       coerce_to_array_of_strings(:skip_testing)
 
+      coerce_to_array_of_strings(:only_test_configurations)
+      coerce_to_array_of_strings(:skip_test_configurations)
+
       return config
     end
 

data/scan/lib/scan/options.rb

@@ -123,12 +123,30 @@ module Scan
                                        verify_type('skip_testing', [Array, String], value)
                                      end),
 
-        # other test options
+        # test plans to run
         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: :only_test_configurations,
+                                     env_name: "SCAN_ONLY_TEST_CONFIGURATIONS",
+                                     description: "Array of strings matching test plan configurations to run",
+                                     optional: true,
+                                     is_string: false,
+                                     verify_block: proc do |value|
+                                       verify_type('only_test_configurations', [Array, String], value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :skip_test_configurations,
+                                     env_name: "SCAN_SKIP_TEST_CONFIGURATIONS",
+                                     description: "Array of strings matching test plan configurations to skip",
+                                     optional: true,
+                                     is_string: false,
+                                     verify_block: proc do |value|
+                                       verify_type('skip_test_configurations', [Array, String], value)
+                                     end),
+
+        # other test options
         FastlaneCore::ConfigItem.new(key: :xctestrun,
                                      short_option: "-X",
                                      env_name: "SCAN_XCTESTRUN",
@@ -380,7 +398,7 @@ module Scan
         FastlaneCore::ConfigItem.new(key: :slack_icon_url,
                                      env_name: "SCAN_SLACK_ICON_URL",
                                      description: "Overrides the webhook's image property if slack_use_webhook_configured_username_and_icon is false",
-                                     default_value: "https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png",
+                                     default_value: "https://fastlane.tools/assets/img/fastlane_icon.png",
                                      is_string: true,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :skip_slack,

data/scan/lib/scan/test_command_generator.rb

@@ -37,8 +37,8 @@ module Scan
       options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
       options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
       options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
-      options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
       if FastlaneCore::Helper.xcode_at_least?(10)
+        options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
         options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
         options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]
       end
@@ -47,6 +47,11 @@ module Scan
       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]
+
+        # detect_values will ensure that these values are present as Arrays if
+        # they are present at all
+        options += config[:only_test_configurations].map { |name| "-only-test-configuration '#{name}'" } if config[:only_test_configurations]
+        options += config[:skip_test_configurations].map { |name| "-skip-test-configuration '#{name}'" } if config[:skip_test_configurations]
       end
       options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]

data/scan/lib/scan/test_result_parser.rb

@@ -3,6 +3,13 @@ require_relative 'module'
 module Scan
   class TestResultParser
     def parse_result(output)
+      unless output
+        return {
+            tests: 0,
+            failures: 0
+        }
+      end
+
       # e.g. ...<testsuites tests='2' failures='1'>...
       matched = output.scan(/<testsuites\b(?=[^<>]*\s+tests='(\d+)')(?=[^<>]*\s+failures='(\d+)')[^<>]+>/)
 
@@ -10,13 +17,13 @@ module Scan
         tests = matched[0][0].to_i
         failures = matched[0][1].to_i
 
-        return {
+        {
           tests: tests,
           failures: failures
         }
       else
         UI.error("Couldn't parse the number of tests from the output")
-        return {
+        {
           tests: 0,
           failures: 0
         }

data/screengrab/lib/screengrab/runner.rb

@@ -57,7 +57,7 @@ module Screengrab
       device_serial = select_device
 
       device_screenshots_paths = [
-        determine_external_screenshots_path(device_serial),
+        determine_external_screenshots_path(device_serial, @config[:locales]),
         determine_internal_screenshots_paths(@config[:app_package_name], @config[:locales])
       ].flatten
 
@@ -130,7 +130,7 @@ module Screengrab
       Dir.glob(File.join(output_directory, '**', device_type, '*.png'), File::FNM_CASEFOLD)
     end
 
-    def determine_external_screenshots_path(device_serial)
+    def determine_external_screenshots_path(device_serial, locales)
       # macOS evaluates $foo in `echo $foo` before executing the command,
       # Windows doesn't - hence the double backslash vs. single backslash
       command = Helper.windows? ? "shell echo \$EXTERNAL_STORAGE " : "shell echo \\$EXTERNAL_STORAGE"
@@ -138,22 +138,23 @@ module Screengrab
                                            print_all: true,
                                            print_command: true)
       device_ext_storage = device_ext_storage.strip
-      File.join(device_ext_storage, @config[:app_package_name], 'screengrab')
+      return locales.map do |locale|
+        File.join(device_ext_storage, @config[:app_package_name], 'screengrab', locale, "images", "screenshots")
+      end.flatten
     end
 
     def determine_internal_screenshots_paths(app_package_name, locales)
-      locale_paths = locales.map do |locale|
+      return locales.map do |locale|
         [
           "/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"
+          "/data/data/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots",
+
+          "/data/data/#{app_package_name}/app_screengrab/#{locale}/images/screenshots",
+          "/data/data/#{app_package_name}/screengrab/#{locale}/images/screenshots"
         ]
       end.flatten
-
-      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)

data/sigh/lib/assets/resign.sh

@@ -620,7 +620,7 @@ function resign {
         # Start with using what comes in provisioning profile entitlements before patching
         cp -f "$PROFILE_ENTITLEMENTS" "$PATCHED_ENTITLEMENTS"
 
-        log "Removing blacklisted keys from patched profile"
+        log "Removing denylisted keys from patched profile"
         # See https://github.com/facebook/buck/issues/798 and https://github.com/facebook/buck/pull/802/files
 
         # Update in https://github.com/facebook/buck/commit/99c0fbc3ab5ecf04d186913374f660683deccdef
@@ -628,7 +628,7 @@ function resign {
 
         # Buck changes referenced above are not self-explanatory and do not seem exhaustive or up-to-date
         # Comments below explain the rules applied to each key in order to make realignment with future Xcode export logic easier
-        BLACKLISTED_KEYS=(\
+        DENYLISTED_KEYS=(\
             # PP list identifiers inconsistent with app-defined ones and this key does not seem to appear in IPA entitlements, so ignore it
             "com.apple.developer.icloud-container-development-container-identifiers" \
             # This key has an invalid generic value in PP (actual value is set by Xcode during export), see dedicated processing a few blocks below
@@ -637,7 +637,7 @@ function resign {
             "com.apple.developer.icloud-container-identifiers" \
             # PP enable all available services and not app-defined ones, must use App entitlements value
             "com.apple.developer.icloud-services" \
-            # Was already blacklisted in previous version, but has someone ever seen this key in a PP?
+            # Was already denylisted in previous version, but has someone ever seen this key in a PP?
             "com.apple.developer.restricted-resource-mode" \
             # If actually used by the App, this value will be set in its entitlements
             "com.apple.developer.nfc.readersession.formats" \
@@ -675,15 +675,15 @@ function resign {
             "com.apple.developer.default-data-protection" \
             # PP seem to list the same groups as the App, but use App entitlements value to be sure
             "com.apple.security.application-groups" \
-            # Was already blacklisted in previous version, seems to be an artifact from an old Xcode release
+            # Was already denylisted in previous version, seems to be an artifact from an old Xcode release
             "com.apple.developer.maps" \
             # If actually used by the App, this value will be set in its entitlements
             "com.apple.external-accessory.wireless-configuration"
         )
 
-        # Blacklisted keys must not be included into new profile, so remove them from patched profile
-        for KEY in "${BLACKLISTED_KEYS[@]}"; do
-            log "Removing blacklisted key: $KEY"
+        # Denylisted keys must not be included into new profile, so remove them from patched profile
+        for KEY in "${DENYLISTED_KEYS[@]}"; do
+            log "Removing denylisted key: $KEY"
             PlistBuddy -c "Delete $KEY" "$PATCHED_ENTITLEMENTS" 2>/dev/null
         done