fastlane 2.147.0 → 2.148.0

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/LaneFileProtocol.swift

@@ -19,6 +19,7 @@ public protocol LaneFileProtocol: class {
     static func runLane(named: String, parameters: [String : String]) -> Bool
 
     func recordLaneDescriptions()
+    func beforeAll(currentLane: String, parameters: [String : String])
     func beforeAll()
     func afterAll(currentLane: String)
     func onError(currentLane: String, errorInfo: String)
@@ -26,6 +27,7 @@ public protocol LaneFileProtocol: class {
 
 public extension LaneFileProtocol {
     var fastlaneVersion: String { return "" } // default "" because that means any is fine
+    func beforeAll(currentLane: String, parameters: [String : String]) { } // no op by default
     func beforeAll() { } // no op by default
     func afterAll(currentLane: String) { } // no op by default
     func onError(currentLane: String, errorInfo: String) {} // no op by default
@@ -37,7 +39,8 @@ public class LaneFile: NSObject, LaneFileProtocol {
     private(set) static var fastfileInstance: Fastfile?
 
     // Called before any lane is executed.
-    private func setupAllTheThings() {
+    private func setupAllTheThings(lane: String, parameters: [String : String]) {
+        LaneFile.fastfileInstance!.beforeAll(currentLane: lane, parameters: parameters)
         LaneFile.fastfileInstance!.beforeAll()
     }
 
@@ -123,7 +126,7 @@ public class LaneFile: NSObject, LaneFileProtocol {
         }
 
         // call all methods that need to be called before we start calling lanes
-        fastfileInstance.setupAllTheThings()
+        fastfileInstance.setupAllTheThings(lane: named, parameters: parameters)
 
         // We need to catch all possible errors here and display a nice message
         _ = fastfileInstance.perform(NSSelectorFromString(laneMethod), with: parameters)

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -102,6 +102,9 @@ protocol MatchfileProtocol: class {
   /// A custom name for the provisioning profile. This will replace the default provisioning profile name if specified
   var profileName: String? { get }
 
+  /// 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
+  var failOnNameTaken: Bool { get }
+
   /// Path in which to export certificates, key and profile
   var outputPath: String? { get }
 
@@ -144,10 +147,11 @@ extension MatchfileProtocol {
   var platform: String { return "ios" }
   var templateName: String? { return nil }
   var profileName: String? { return nil }
+  var failOnNameTaken: Bool { return false }
   var outputPath: String? { return nil }
   var verbose: Bool { return false }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.16]
+// FastlaneRunnerAPIVersion [0.9.17]

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -45,6 +45,12 @@ protocol ScanfileProtocol: class {
   /// The testplan associated with the scheme that should be used for testing
   var testplan: String? { get }
 
+  /// Array of strings matching test plan configurations to run
+  var onlyTestConfigurations: String? { get }
+
+  /// Array of strings matching test plan configurations to skip
+  var skipTestConfigurations: String? { get }
+
   /// Run tests using the provided `.xctestrun` file
   var xctestrun: String? { get }
 
@@ -200,6 +206,8 @@ extension ScanfileProtocol {
   var onlyTesting: String? { return nil }
   var skipTesting: String? { return nil }
   var testplan: String? { return nil }
+  var onlyTestConfigurations: String? { return nil }
+  var skipTestConfigurations: String? { return nil }
   var xctestrun: String? { return nil }
   var toolchain: String? { return nil }
   var clean: Bool { return false }
@@ -250,4 +258,4 @@ extension ScanfileProtocol {
 
 // 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/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.147.0
+// Generated with fastlane 2.148.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -113,6 +113,12 @@ protocol SnapshotfileProtocol: class {
 
   /// The testplan associated with the scheme that should be used for testing
   var testplan: String? { get }
+
+  /// Array of strings matching Test Bundle/Test Suite/Test Cases to run
+  var onlyTesting: String? { get }
+
+  /// Array of strings matching Test Bundle/Test Suite/Test Cases to skip
+  var skipTesting: String? { get }
 }
 
 extension SnapshotfileProtocol {
@@ -154,8 +160,10 @@ extension SnapshotfileProtocol {
   var disableSlideToType: Bool { return false }
   var clonedSourcePackagesPath: String? { return nil }
   var testplan: String? { return nil }
+  var onlyTesting: String? { return nil }
+  var skipTesting: String? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.8]
+// FastlaneRunnerAPIVersion [0.9.9]

data/frameit/lib/frameit/commands_generator.rb

@@ -30,6 +30,7 @@ module Frameit
       program :help_formatter, :compact
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       default_command(:run)
 

data/gym/lib/gym/generators/package_command_generator.rb

@@ -53,6 +53,10 @@ module Gym
         generator.asset_packs_path
       end
 
+      def appstore_info_path
+        generator.appstore_info_path
+      end
+
       # The generator we need to use for the currently used Xcode version
       # Since we dropped Xcode 6 support, it's just this class, but maybe we'll have
       # new classes in the future

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -141,6 +141,10 @@ module Gym
         Gym.cache[:asset_packs_path] ||= File.join(temporary_output_path, "OnDemandResources")
       end
 
+      def appstore_info_path
+        Gym.cache[:appstore_info_path] ||= File.join(temporary_output_path, "AppStoreInfo.plist")
+      end
+
       private
 
       def normalize_export_options(hash)

data/gym/lib/gym/runner.rb

@@ -40,6 +40,7 @@ module Gym
         move_app_thinning_size_report
         move_apps_folder
         move_asset_packs
+        move_appstore_info
       elsif is_mac
         path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
@@ -49,6 +50,7 @@ module Gym
 
           package_app
           path = move_pkg
+          move_appstore_info
           return path
         end
         copy_files_from_path(File.join(BuildCommandGenerator.archive_path, "Products/usr/local/bin/*")) if Gym.project.command_line_tool?
@@ -339,6 +341,18 @@ module Gym
       end
     end
 
+    # Move the AppStoreInfo.plist folder to the output directory
+    def move_appstore_info
+      if File.exist?(PackageCommandGenerator.appstore_info_path)
+        FileUtils.mv(PackageCommandGenerator.appstore_info_path, File.expand_path(Gym.config[:output_directory]), force: true)
+        appstore_info_path = File.join(File.expand_path(Gym.config[:output_directory]), File.basename(PackageCommandGenerator.appstore_info_path))
+
+        UI.success("Successfully exported the AppStoreInfo.plist file:")
+        UI.message(appstore_info_path)
+        appstore_info_path
+      end
+    end
+
     def find_archive_path
       Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
     end

data/match/lib/match/commands_generator.rb

@@ -35,6 +35,7 @@ module Match
       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 :run do |c|
         c.syntax = 'fastlane match'

data/match/lib/match/generator.rb

@@ -76,7 +76,8 @@ module Match
         ignore_profiles_with_different_name: true,
         team_id: params[:team_id],
         team_name: params[:team_name],
-        template_name: params[:template_name]
+        template_name: params[:template_name],
+        fail_on_name_taken: params[:fail_on_name_taken]
       }
 
       values[:platform] = params[:platform]

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

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