fastlane 2.146.1 → 2.149.1

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.146.1
+// Generated with fastlane 2.149.1

data/fastlane/swift/GymfileProtocol.swift

@@ -60,7 +60,7 @@ protocol GymfileProtocol: class {
   /// Platform to build when using a Catalyst enabled app. Valid values are: ios, macos
   var catalystPlatform: String? { get }
 
-  /// Full name of 3rd Party Mac Developer Installer or Deveoper ID Installer certificate. Example: `3rd Party Mac Developer Installer: Your Company (ABC1234XWYZ)`
+  /// Full name of 3rd Party Mac Developer Installer or Developer ID Installer certificate. Example: `3rd Party Mac Developer Installer: Your Company (ABC1234XWYZ)`
   var installerCertName: String? { get }
 
   /// The directory in which the archive should be stored in

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.146.1
+// Generated with fastlane 2.149.1

data/fastlane/swift/MatchfileProtocol.swift

@@ -99,6 +99,12 @@ protocol MatchfileProtocol: class {
   /// The name of provisioning profile template. If the developer account has provisioning profile templates (aka: custom entitlements), the template name can be found by inspecting the Entitlements drop-down while creating/editing a provisioning profile (e.g. "Apple Pay Pass Suppression Development")
   var templateName: String? { get }
 
+  /// 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 }
 
@@ -140,10 +146,12 @@ extension MatchfileProtocol {
   var skipDocs: Bool { return false }
   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.15]
+// FastlaneRunnerAPIVersion [0.9.17]

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.146.1
+// Generated with fastlane 2.149.1

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.146.1
+// Generated with fastlane 2.149.1

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 }
 
@@ -66,10 +72,13 @@ protocol ScanfileProtocol: class {
   /// Should the HTML report be opened when tests are completed?
   var openReport: Bool { get }
 
+  /// Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
+  var disableXcpretty: Bool? { get }
+
   /// The directory in which all reports will be stored
   var outputDirectory: String { get }
 
-  /// Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty)
+  /// Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty during xcodebuild)
   var outputStyle: String? { get }
 
   /// Comma separated list of the output types (e.g. html, junit, json-compilation-database)
@@ -197,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 }
@@ -204,6 +215,7 @@ extension ScanfileProtocol {
   var addressSanitizer: Bool? { return nil }
   var threadSanitizer: Bool? { return nil }
   var openReport: Bool { return false }
+  var disableXcpretty: Bool? { return nil }
   var outputDirectory: String { return "./test_output" }
   var outputStyle: String? { return nil }
   var outputTypes: String { return "html,junit" }
@@ -234,7 +246,7 @@ extension ScanfileProtocol {
   var slackMessage: String? { return nil }
   var slackUseWebhookConfiguredUsernameAndIcon: Bool { return false }
   var slackUsername: String { return "fastlane" }
-  var slackIconUrl: String { return "https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png" }
+  var slackIconUrl: String { return "https://fastlane.tools/assets/img/fastlane_icon.png" }
   var skipSlack: Bool { return false }
   var slackOnlyOnFailure: Bool { return false }
   var destination: String? { return nil }
@@ -246,4 +258,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.27]
+// FastlaneRunnerAPIVersion [0.9.30]

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.146.1
+// Generated with fastlane 2.149.1

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.146.1
+// Generated with fastlane 2.149.1

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -45,6 +45,9 @@ protocol SnapshotfileProtocol: class {
   /// Enabling this option will automatically erase the simulator before running the application
   var eraseSimulator: Bool { get }
 
+  /// Enabling this option wil automatically override the status bar to show 9:41 AM, full battery, and full reception
+  var overrideStatusBar: Bool { get }
+
   /// Enabling this option will configure the Simulator's system language
   var localizeSimulator: Bool { get }
 
@@ -60,6 +63,9 @@ protocol SnapshotfileProtocol: class {
   /// A list of videos that should be added to the simulator before running the application
   var addVideos: [String]? { get }
 
+  /// A path to screenshots.html template
+  var htmlTemplate: String { get }
+
   /// The directory where to store the build log
   var buildlogPath: String { get }
 
@@ -107,6 +113,18 @@ protocol SnapshotfileProtocol: class {
 
   /// Sets a custom path for Swift Package Manager dependencies
   var clonedSourcePackagesPath: String? { get }
+
+  /// 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 }
+
+  /// Disable xcpretty formatting of build
+  var disableXcpretty: Bool? { get }
 }
 
 extension SnapshotfileProtocol {
@@ -125,11 +143,13 @@ extension SnapshotfileProtocol {
   var clearPreviousScreenshots: Bool { return false }
   var reinstallApp: Bool { return false }
   var eraseSimulator: Bool { return false }
+  var overrideStatusBar: Bool { return false }
   var localizeSimulator: Bool { return false }
   var darkMode: Bool? { return nil }
   var appIdentifier: String? { return nil }
   var addPhotos: [String]? { return nil }
   var addVideos: [String]? { return nil }
+  var htmlTemplate: String { return "/Users/josh/Projects/fastlane/fastlane/snapshot/lib/snapshot/page.html.erb" }
   var buildlogPath: String { return "~/Library/Logs/snapshot" }
   var clean: Bool { return false }
   var testWithoutBuilding: Bool? { return nil }
@@ -146,8 +166,12 @@ extension SnapshotfileProtocol {
   var concurrentSimulators: Bool { return true }
   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 }
+  var disableXcpretty: Bool? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.7]
+// FastlaneRunnerAPIVersion [0.9.10]

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -416,5 +416,22 @@ module FastlaneCore
       UI.deprecated("Helper.log is deprecated. Use `UI` class instead")
       UI.current.log
     end
+
+    def self.ask_password(message: "Passphrase: ", confirm: nil)
+      raise "This code should only run in interactive mode" unless UI.interactive?
+
+      loop do
+        password = UI.password(message)
+        if confirm
+          password2 = UI.password("Type passphrase again: ")
+          if password == password2
+            return password
+          end
+        else
+          return password
+        end
+        UI.error("Passphrases differ. Try again")
+      end
+    end
   end
 end

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -1,9 +1,10 @@
 require_relative 'helper'
 require 'open3'
+require 'security'
 
 module FastlaneCore
   class KeychainImporter
-    def self.import_file(path, keychain_path, keychain_password: "", certificate_password: "", output: FastlaneCore::Globals.verbose?)
+    def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", output: FastlaneCore::Globals.verbose?)
       UI.user_error!("Could not find file '#{path}'") unless File.exist?(path)
 
       command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"
@@ -19,6 +20,7 @@ module FastlaneCore
 
         # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
         if thrd.value.success?
+          keychain_password ||= resolve_keychain_password(keychain_path)
           set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
         else
           # Output verbose if file is already installed since not an error otherwise we will show the whole error
@@ -32,7 +34,7 @@ module FastlaneCore
       end
     end
 
-    def self.set_partition_list(path, keychain_path, keychain_password: "", output: FastlaneCore::Globals.verbose?)
+    def self.set_partition_list(path, keychain_path, keychain_password: nil, output: FastlaneCore::Globals.verbose?)
       # When security supports partition lists, also add the partition IDs
       # See https://openradar.appspot.com/28524119
       if Helper.backticks('security -h | grep set-key-partition-list', print: false).length > 0
@@ -53,6 +55,9 @@ module FastlaneCore
 
             # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
             if err.include?("SecKeychainItemSetAccessWithPassword")
+              keychain_name = File.basename(keychain_path, ".*")
+              Security::InternetPassword.delete(server: server_name(keychain_name))
+
               UI.important("")
               UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
                        "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
@@ -72,5 +77,44 @@ module FastlaneCore
 
       end
     end
+
+    # https://github.com/fastlane/fastlane/issues/14196
+    # Keychain password is needed to set the partition list to
+    # prevent Xcode from prompting dialog for keychain password when signing
+    # 1. Uses keychain password from login keychain if found
+    # 2. Prompts user for keychain password and stores it in login keychain for user later
+    def self.resolve_keychain_password(keychain_path)
+      keychain_name = File.basename(keychain_path, ".*")
+      server = server_name(keychain_name)
+
+      # Attempt to find password in keychain for keychain
+      item = Security::InternetPassword.find(server: server)
+      if item
+        keychain_password = item.password
+        UI.important("Using keychain password from keychain item #{server} in #{keychain_path}")
+      end
+
+      if keychain_password.nil?
+        if UI.interactive?
+          UI.important("Enter the password for #{keychain_path}")
+          UI.important("This passphrase will be stored in your local keychain with the name #{server} and used in future runs")
+          UI.important("This prompt can be avoided by specifying the 'keychain_password' option or 'MATCH_KEYCHAIN_PASSWORD' environment variable")
+          keychain_password = FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true)
+          Security::InternetPassword.add(server, "", keychain_password)
+        else
+          UI.important("Keychain password for #{keychain_path} was not specified and not found in your keychain. Specify the 'keychain_password' option to prevent the UI permission popup when code signing")
+          keychain_password = ""
+        end
+      end
+
+      return keychain_password
+    end
+
+    # server name used for accessing the macOS keychain
+    def self.server_name(keychain_name)
+      ["fastlane", "keychain", keychain_name].join("_")
+    end
+
+    private_class_method :server_name
   end
 end

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/frameit/lib/frameit/device_types.rb

@@ -64,6 +64,14 @@ module Frameit
     def self.all_platforms
       Platform.constants.map { |c| Platform.const_get(c) }
     end
+
+    def self.symbol_to_constant(symbol)
+      if symbol == :android
+        ANDROID
+      else
+        IOS
+      end
+    end
   end
 
   module Devices
@@ -119,6 +127,8 @@ module Frameit
     IPAD_PRO = Frameit::Device.new("ipad-pro", "Apple iPad Pro", 3, [[2048, 2732], [2732, 2048]], 264, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_IPAD_PRO)
     # 3rd generation:
     IPAD_PRO_12_9 = Frameit::Device.new("ipadPro129", "Apple iPad Pro (12.9-inch) (3rd generation)", 4, [[2048, 2732], [2732, 2048]], 264, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_IPAD_PRO_12_9)
+    # 4th generation:
+    IPAD_PRO_12_9_4 = Frameit::Device.new("ipadPro129", "Apple iPad Pro (12.9-inch) (4th generation)", 5, [[2048, 2732], [2732, 2048]], 264, Color::SPACE_GRAY, Platform::IOS, Deliver::AppScreenshot::ScreenSize::IOS_IPAD_PRO_12_9)
     # iPad Pro (10.5-inch) is not in frameit-frames repo, but must be included so that we are backward compatible with PR #15373
     # priority must be lower so that users who didn't copy the frame to their frameit frames folder will not get an error
     # ID and formatted name must be exactly as specified so that device.detect_device() will select this device if the filename includes them

data/frameit/lib/frameit/options.rb

@@ -1,4 +1,6 @@
 require 'fastlane_core/configuration/config_item'
+require 'fastlane/actions/actions_helper'
+require 'fastlane/helper/lane_helper'
 
 require_relative 'module'
 require_relative 'config_parser'
@@ -97,9 +99,10 @@ module Frameit
                                        type: Boolean),
         FastlaneCore::ConfigItem.new(key: :use_platform,
                                        env_name: "FRAMEIT_USE_PLATFORM",
-                                       description: "Choose a platform, the valid options are IOS, ANDROID and ANY (IOS is default to ensure backward compatibility)",
+                                       description: "Choose a platform, the valid options are IOS, ANDROID and ANY (default is either general platform defined in the fastfile or IOS to ensure backward compatibility)",
                                        optional: true,
-                                       default_value: Platform::IOS,
+                                       default_value: Platform.symbol_to_constant(Fastlane::Helper::LaneHelper.current_platform),
+                                       default_value_dynamic: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Invalid platform type '#{value}'. Available values are " + Platform.all_platforms.join(', ') + ".") unless ConfigParser.supported_platform?(value)
                                        end)

data/frameit/lib/frameit/runner.rb

@@ -82,8 +82,13 @@ module Frameit
     # Loads the config (colors, background, texts, etc.)
     # Don't use this method to access the actual text and use `fetch_texts` instead
     def create_config(screenshot_path)
+      # Screengrab pulls screenshots to a different folder location
+      # frameit only handles two levels of folders, to not break
+      # compatibility with Supply we look into a different path for Android
+      # Issue https://github.com/fastlane/fastlane/issues/16289
       config_path = File.join(File.expand_path("..", screenshot_path), "Framefile.json")
       config_path = File.join(File.expand_path("../..", screenshot_path), "Framefile.json") unless File.exist?(config_path)
+      config_path = File.join(File.expand_path("../../../..", screenshot_path), "Framefile.json") unless File.exist?(config_path)
       file = ConfigParser.new.load(config_path)
       return {} unless file # no config file at all
       file.fetch_value(screenshot_path)

data/frameit/lib/frameit/screenshot.rb

@@ -27,6 +27,7 @@ module Frameit
       #   - see Parameters in the doc
       #   - contains default values and validates values
       #   - accessed via Frameit.config[:key]
+      #   - default value is either general platform from fastfile or IOS if run directly
       #   - lowest priority
       # - commands_generator.rb
       #   - commands entered directly to CLI (e. g. fastlane frameit android)

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/options.rb

@@ -155,7 +155,7 @@ module Gym
                                      end),
         FastlaneCore::ConfigItem.new(key: :installer_cert_name,
                                      env_name: "GYM_INSTALLER_CERT_NAME",
-                                     description: "Full name of 3rd Party Mac Developer Installer or Deveoper ID Installer certificate. Example: `3rd Party Mac Developer Installer: Your Company (ABC1234XWYZ)`",
+                                     description: "Full name of 3rd Party Mac Developer Installer or Developer ID Installer certificate. Example: `3rd Party Mac Developer Installer: Your Company (ABC1234XWYZ)`",
                                      type: String,
                                      optional: true),
         # Very optional