fastlane 2.143.0 → 2.147.0

data/fastlane/swift/Gymfile.swift

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

data/fastlane/swift/Matchfile.swift

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

data/fastlane/swift/MatchfileProtocol.swift

@@ -69,7 +69,7 @@ protocol MatchfileProtocol: class {
   /// S3 access key
   var s3AccessKey: String? { get }
 
-  /// S3 secret secret access key
+  /// S3 secret access key
   var s3SecretAccessKey: String? { get }
 
   /// Name of the S3 bucket
@@ -99,6 +99,9 @@ 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 }
+
   /// Path in which to export certificates, key and profile
   var outputPath: String? { get }
 
@@ -140,10 +143,11 @@ extension MatchfileProtocol {
   var skipDocs: Bool { return false }
   var platform: String { return "ios" }
   var templateName: String? { return nil }
+  var profileName: String? { return nil }
   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.14]
+// FastlaneRunnerAPIVersion [0.9.16]

data/fastlane/swift/Precheckfile.swift

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

data/fastlane/swift/Scanfile.swift

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

data/fastlane/swift/ScanfileProtocol.swift

@@ -42,6 +42,9 @@ protocol ScanfileProtocol: class {
   /// Array of strings matching Test Bundle/Test Suite/Test Cases to skip
   var skipTesting: String? { get }
 
+  /// The testplan associated with the scheme that should be used for testing
+  var testplan: String? { get }
+
   /// Run tests using the provided `.xctestrun` file
   var xctestrun: String? { get }
 
@@ -63,10 +66,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)
@@ -193,6 +199,7 @@ extension ScanfileProtocol {
   var appIdentifier: String? { return nil }
   var onlyTesting: String? { return nil }
   var skipTesting: String? { return nil }
+  var testplan: String? { return nil }
   var xctestrun: String? { return nil }
   var toolchain: String? { return nil }
   var clean: Bool { return false }
@@ -200,6 +207,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" }
@@ -242,4 +250,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.26]
+// FastlaneRunnerAPIVersion [0.9.28]

data/fastlane/swift/Screengrabfile.swift

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

data/fastlane/swift/Snapshotfile.swift

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

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 }
 
@@ -107,6 +110,9 @@ 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 }
 }
 
 extension SnapshotfileProtocol {
@@ -125,6 +131,7 @@ 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 }
@@ -146,8 +153,9 @@ extension SnapshotfileProtocol {
   var concurrentSimulators: Bool { return true }
   var disableSlideToType: Bool { return false }
   var clonedSourcePackagesPath: String? { return nil }
+  var testplan: String? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.7]
+// FastlaneRunnerAPIVersion [0.9.8]

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -2,6 +2,7 @@ require_relative '../ui/ui'
 require_relative '../ui/errors/fastlane_error'
 require_relative '../helper'
 require_relative '../module'
+require 'json'
 
 module FastlaneCore
   class ConfigItem
@@ -227,6 +228,7 @@ module FastlaneCore
       true
     end
 
+    # rubocop:disable Metrics/PerceivedComplexity
     # Returns an updated value type (if necessary)
     def auto_convert_value(value)
       return nil if value.nil?
@@ -240,6 +242,12 @@ module FastlaneCore
       elsif allow_shell_conversion
         return value.shelljoin if value.kind_of?(Array)
         return value.map { |k, v| "#{k.to_s.shellescape}=#{v.shellescape}" }.join(' ') if value.kind_of?(Hash)
+      elsif data_type == Hash && value.kind_of?(String)
+        begin
+          parsed = JSON.parse(value)
+          return parsed if parsed.kind_of?(Hash)
+        rescue JSON::ParserError
+        end
       elsif data_type != String
         # Special treatment if the user specified true, false or YES, NO
         # There is no boolean type, so we just do it here
@@ -249,6 +257,7 @@ module FastlaneCore
           return false
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       return value # fallback to not doing anything
     end

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -49,8 +49,8 @@ module FastlaneCore
 
             # "    iPad (5th generation) (852A5796-63C3-4641-9825-65EBDC5C4259) (Shutdown)"
             # This line will turn the above string into
-            # ["iPad", "(5th generation)", "(852A5796-63C3-4641-9825-65EBDC5C4259)", "(Shutdown)"]
-            matches = line.strip.scan(/(.*?) (\(.*?\))/).flatten.reject(&:empty?)
+            # ["iPad (5th generation)", "(852A5796-63C3-4641-9825-65EBDC5C4259)", "(Shutdown)"]
+            matches = line.strip.scan(/^(.*?) (\([^)]*?\)) (\([^)]*?\))$/).flatten.reject(&:empty?)
             state = matches.pop.to_s.delete('(').delete(')')
             udid = matches.pop.to_s.delete('(').delete(')')
             name = matches.join(' ')
@@ -223,7 +223,7 @@ module FastlaneCore
         plist_buddy_cmd = "-c \"Add :KeyboardContinuousPathEnabled bool false\""
         plist_path = File.expand_path("~/Library/Developer/CoreSimulator/Devices/#{self.udid}/data/Library/Preferences/com.apple.keyboard.ContinuousPath.plist")
 
-        Helper.backticks("#{plist_buddy} #{plist_buddy_cmd} #{plist_path}")
+        Helper.backticks("#{plist_buddy} #{plist_buddy_cmd} #{plist_path} >/dev/null 2>&1")
       end
     end
   end

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/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -44,16 +44,29 @@ module FastlaneCore
         parse(path, keychain_path).fetch("Name")
       end
 
+      def bundle_id(path, keychain_path = nil)
+        profile = parse(path, keychain_path)
+        app_id_prefix = profile["ApplicationIdentifierPrefix"].first
+        bundle_id = profile["Entitlements"]["application-identifier"].gsub("#{app_id_prefix}.", "")
+        bundle_id
+      rescue
+        UI.error("Unable to extract the Bundle Id from the provided provisioning profile '#{path}'.")
+      end
+
       def mac?(path, keychain_path = nil)
         parse(path, keychain_path).fetch("Platform", []).include?('OSX')
       end
 
       def profile_filename(path, keychain_path = nil)
         basename = uuid(path, keychain_path)
+        basename + profile_extension(path, keychain_path)
+      end
+
+      def profile_extension(path, keychain_path = nil)
         if mac?(path, keychain_path)
-          basename + ".provisionprofile"
+          ".provisionprofile"
         else
-          basename + ".mobileprovision"
+          ".mobileprovision"
         end
       end
 

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

@@ -535,7 +535,7 @@ module Frameit
         fonts.each do |font|
           if font['supported']
             font['supported'].each do |language|
-              if screenshot.path.include?(language)
+              if screenshot.language == language
                 return font["font"]
               end
             end

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)
@@ -122,6 +123,10 @@ module Frameit
       return File.mtime(path) > File.mtime(output_path)
     end
 
+    def language
+      @language ||= Pathname.new(path).parent.basename.to_s
+    end
+
     def to_s
       self.path
     end

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

@@ -49,6 +49,10 @@ module Gym
         generator.apps_path
       end
 
+      def asset_packs_path
+        generator.asset_packs_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