fastlane 2.151.1 → 2.154.0

data/fastlane/swift/Gymfile.swift

@@ -14,4 +14,4 @@ class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/GymfileProtocol.swift

@@ -181,4 +181,4 @@ extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.26]
+// FastlaneRunnerAPIVersion [0.9.31]

data/fastlane/swift/Matchfile.swift

@@ -14,4 +14,4 @@ class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -53,6 +53,9 @@ protocol MatchfileProtocol: class {
     /// Use a bearer authorization header to access the git repo (e.g.: access to an Azure Devops repository), usually a string in Base64
     var gitBearerAuthorization: String? { get }
 
+    /// Use a private key to access the git repo (e.g.: access to GitHub repository via Deploy keys), usually a id_rsa named file or the contents hereof
+    var gitPrivateKey: String? { get }
+
     /// Name of the Google Cloud Storage bucket to use
     var googleCloudBucketName: String? { get }
 
@@ -133,6 +136,7 @@ extension MatchfileProtocol {
     var cloneBranchDirectly: Bool { return false }
     var gitBasicAuthorization: String? { return nil }
     var gitBearerAuthorization: String? { return nil }
+    var gitPrivateKey: String? { return nil }
     var googleCloudBucketName: String? { return nil }
     var googleCloudKeysFile: String? { return nil }
     var googleCloudProjectId: String? { return nil }
@@ -157,4 +161,4 @@ extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.20]
+// FastlaneRunnerAPIVersion [0.9.25]

data/fastlane/swift/Precheckfile.swift

@@ -14,4 +14,4 @@ class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -33,4 +33,4 @@ extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.19]
+// FastlaneRunnerAPIVersion [0.9.24]

data/fastlane/swift/Scanfile.swift

@@ -14,4 +14,4 @@ class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -257,4 +257,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.31]
+// FastlaneRunnerAPIVersion [0.9.36]

data/fastlane/swift/Screengrabfile.swift

@@ -14,4 +14,4 @@ class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -93,4 +93,4 @@ extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.21]
+// FastlaneRunnerAPIVersion [0.9.26]

data/fastlane/swift/Snapshotfile.swift

@@ -14,4 +14,4 @@ class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.151.1
+// Generated with fastlane 2.154.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -44,6 +44,9 @@ protocol SnapshotfileProtocol: class {
     /// Enabling this option will automatically erase the simulator before running the application
     var eraseSimulator: Bool { get }
 
+    /// Enabling this option will prevent displaying the simulator window
+    var headless: 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 }
 
@@ -142,6 +145,7 @@ extension SnapshotfileProtocol {
     var clearPreviousScreenshots: Bool { return false }
     var reinstallApp: Bool { return false }
     var eraseSimulator: Bool { return false }
+    var headless: Bool { return true }
     var overrideStatusBar: Bool { return false }
     var localizeSimulator: Bool { return false }
     var darkMode: Bool? { return nil }
@@ -173,4 +177,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.15]
+// FastlaneRunnerAPIVersion [0.9.20]

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -199,18 +199,37 @@ module FastlaneCore
         self.name
       end
 
+      def boot
+        return unless is_simulator
+        return unless os_type == "iOS"
+        return if self.state == 'Booted'
+
+        UI.message("Booting #{self}")
+
+        `xcrun simctl boot #{self.udid} 2>/dev/null`
+        self.state = 'Booted'
+      end
+
+      def shutdown
+        return unless is_simulator
+        return unless os_type == "iOS"
+        return if self.state != 'Booted'
+
+        UI.message("Shutting down #{self.udid}")
+        `xcrun simctl shutdown #{self.udid} 2>/dev/null`
+        self.state = 'Shutdown'
+      end
+
       def reset
         UI.message("Resetting #{self}")
-        `xcrun simctl shutdown #{self.udid}` if self.state == "Booted"
+        shutdown
         `xcrun simctl erase #{self.udid}`
-        return
       end
 
       def delete
         UI.message("Deleting #{self}")
-        `xcrun simctl shutdown #{self.udid}` unless self.state == "Shutdown"
+        shutdown
         `xcrun simctl delete #{self.udid}`
-        return
       end
 
       def disable_slide_to_type
@@ -324,10 +343,10 @@ module FastlaneCore
       def copy_logarchive(device, log_identity, logs_destination_dir)
         require 'shellwords'
 
-        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive").shellescape
+        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive")
         FileUtils.rm_rf(logarchive_dst)
         FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
-        command = "xcrun simctl spawn --standalone #{device.udid} log collect --output #{logarchive_dst} 2>/dev/null"
+        command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst.shellescape} 2>/dev/null"
         FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
       end
     end

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -249,10 +249,11 @@ module FastlaneCore
     def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m upload',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           "-f #{source.shellescape}",
           additional_upload_parameters, # that's here, because the user might overwrite the -t option
           '-k 100000',
@@ -285,10 +286,11 @@ module FastlaneCore
     def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m lookupMetadata',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           "-apple_id #{apple_id.shellescape}",
           "-destination #{destination.shellescape}",
           ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
@@ -319,10 +321,11 @@ module FastlaneCore
     def build_provider_ids_command(username, password)
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m provider',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       else

data/frameit/lib/frameit/editor.rb

@@ -298,7 +298,7 @@ module Frameit
       resize_text(keyword)
 
       vertical_padding = vertical_frame_padding # assign padding to variable
-      spacing_between_title_and_keyword = (actual_font_size / 2)
+      spacing_between_title_and_keyword = (actual_font_size('keyword') / 2)
       title_left_space = (background.width / 2.0 - title.width / 2.0).round
       keyword_left_space = (background.width / 2.0 - keyword.width / 2.0).round
 
@@ -359,7 +359,7 @@ module Frameit
       vertical_padding = vertical_frame_padding # assign padding to variable
       left_space = (background.width / 2.0 - sum_width / 2.0).round
 
-      self.space_to_device += actual_font_size + vertical_padding
+      self.space_to_device += actual_font_size('title') + vertical_padding
 
       if title_below_image
         title_top = background.height - effective_text_height / 2 - title.height / 2
@@ -385,7 +385,10 @@ module Frameit
       background
     end
 
-    def actual_font_size
+    def actual_font_size(key)
+      font_size = @config[key.to_s]['font_size']
+      return font_size if !font_size.nil? && font_size > 0
+
       font_scale_factor = @config['font_scale_factor'] || 0.1
       UI.user_error!("Parameter 'font_scale_factor' can not be 0. Please provide a value larger than 0.0 (default = 0.1).") if font_scale_factor == 0.0
       [@image.width * font_scale_factor].max.round
@@ -393,7 +396,7 @@ module Frameit
 
     # The space between the keyword and the title
     def keyword_padding
-      (actual_font_size / 3.0).round
+      (actual_font_size('keyword') / 3.0).round
     end
 
     # This will build up to 2 individual images with the title and optional keyword, which will then be added to the real image
@@ -427,7 +430,7 @@ module Frameit
         text_image.combine_options do |i|
           i.font(current_font) if current_font
           i.gravity("Center")
-          i.pointsize(actual_font_size)
+          i.pointsize(actual_font_size(key))
           i.draw("text 0,0 '#{text}'")
           i.interline_spacing(interline_spacing) if interline_spacing
           i.fill(@config[key.to_s]['color'])
@@ -497,7 +500,9 @@ module Frameit
       UI.user_error!("Valid parameters :keyword, :title") unless [:keyword, :title].include?(type)
 
       # Try to get it from a keyword.strings or title.strings file
-      strings_path = File.join(File.expand_path("..", screenshot.path), "#{type}.strings")
+      strings_path = File.join(File.expand_path("../", screenshot.path), "#{type}.strings")
+      strings_path = File.join(File.expand_path("../../", screenshot.path), "#{type}.strings") unless File.exist?(strings_path)
+      strings_path = File.join(File.expand_path("../../../", screenshot.path), "#{type}.strings") unless File.exist?(strings_path)
       if File.exist?(strings_path)
         parsed = StringsParser.parse(strings_path)
         text_array = parsed.find { |k, v| screenshot.path.upcase.include?(k.upcase) }

data/gym/lib/gym/module.rb

@@ -32,6 +32,14 @@ module Gym
     def building_mac_catalyst_for_mac?
       Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "macos"
     end
+
+    def export_destination_upload?
+      config_path = Gym.cache[:config_path]
+      return false if config_path.nil?
+
+      result = CFPropertyList.native_types(CFPropertyList::List.new(file: config_path).value)
+      return result["destination"] == "upload"
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/gym/lib/gym/runner.rb

@@ -13,6 +13,7 @@ require_relative 'error_handler'
 module Gym
   class Runner
     # @return (String) The path to the resulting ipa
+    # rubocop:disable Metrics/PerceivedComplexity
     def run
       unless Gym.config[:skip_build_archive]
         build_app
@@ -34,13 +35,16 @@ module Gym
 
         package_app
         compress_and_move_dsym
-        path = move_ipa
-        move_manifest
-        move_app_thinning
-        move_app_thinning_size_report
-        move_apps_folder
-        move_asset_packs
-        move_appstore_info
+
+        unless Gym.export_destination_upload?
+          path = move_ipa
+          move_manifest
+          move_app_thinning
+          move_app_thinning_size_report
+          move_apps_folder
+          move_asset_packs
+          move_appstore_info
+        end
       elsif is_mac
         path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
@@ -49,14 +53,17 @@ module Gym
           return path if Gym.config[:skip_package_pkg]
 
           package_app
-          path = move_pkg
-          move_appstore_info
+          unless Gym.export_destination_upload?
+            path = move_pkg
+            move_appstore_info
+          end
           return path
         end
         copy_files_from_path(File.join(BuildCommandGenerator.archive_path, "Products/usr/local/bin/*")) if Gym.project.command_line_tool?
       end
       return path
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     #####################################################
     # @!group Printing out things

data/match/lib/match/options.rb

@@ -141,14 +141,21 @@ module Match
                                      env_name: "MATCH_GIT_BASIC_AUTHORIZATION",
                                      sensitive: true,
                                      description: "Use a basic authorization header to access the git repo (e.g.: access via HTTPS, GitHub Actions, etc), usually a string in Base64",
-                                     conflicting_options: [:git_bearer_authorization],
+                                     conflicting_options: [:git_bearer_authorization, :git_private_key],
                                      optional: true,
                                      default_value: nil),
         FastlaneCore::ConfigItem.new(key: :git_bearer_authorization,
                                      env_name: "MATCH_GIT_BEARER_AUTHORIZATION",
                                      sensitive: true,
                                      description: "Use a bearer authorization header to access the git repo (e.g.: access to an Azure Devops repository), usually a string in Base64",
-                                     conflicting_options: [:git_basic_authorization],
+                                     conflicting_options: [:git_basic_authorization, :git_private_key],
+                                     optional: true,
+                                     default_value: nil),
+        FastlaneCore::ConfigItem.new(key: :git_private_key,
+                                     env_name: "MATCH_GIT_PRIVATE_KEY",
+                                     sensitive: true,
+                                     description: "Use a private key to access the git repo (e.g.: access to GitHub repository via Deploy keys), usually a id_rsa named file or the contents hereof",
+                                     conflicting_options: [:git_basic_authorization, :git_bearer_authorization],
                                      optional: true,
                                      default_value: nil),
 

data/match/lib/match/runner.rb

@@ -40,16 +40,17 @@ module Match
         clone_branch_directly: params[:clone_branch_directly],
         git_basic_authorization: params[:git_basic_authorization],
         git_bearer_authorization: params[:git_bearer_authorization],
+        git_private_key: params[:git_private_key],
         type: params[:type].to_s,
         generate_apple_certs: params[:generate_apple_certs],
         platform: params[:platform].to_s,
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
         google_cloud_project_id: params[:google_cloud_project_id].to_s,
-        s3_region: params[:s3_region].to_s,
-        s3_access_key: params[:s3_access_key].to_s,
-        s3_secret_access_key: params[:s3_secret_access_key].to_s,
-        s3_bucket: params[:s3_bucket].to_s,
+        s3_region: params[:s3_region],
+        s3_access_key: params[:s3_access_key],
+        s3_secret_access_key: params[:s3_secret_access_key],
+        s3_bucket: params[:s3_bucket],
         s3_object_prefix: params[:s3_object_prefix],
         readonly: params[:readonly],
         username: params[:readonly] ? nil : params[:username], # only pass username if not readonly

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

@@ -19,6 +19,7 @@ module Match
       attr_accessor :platform
       attr_accessor :git_basic_authorization
       attr_accessor :git_bearer_authorization
+      attr_accessor :git_private_key
 
       def self.configure(params)
         return self.new(
@@ -32,7 +33,8 @@ module Match
           git_user_email: params[:git_user_email],
           clone_branch_directly: params[:clone_branch_directly],
           git_basic_authorization: params[:git_basic_authorization],
-          git_bearer_authorization: params[:git_bearer_authorization]
+          git_bearer_authorization: params[:git_bearer_authorization],
+          git_private_key: params[:git_private_key]
         )
       end
 
@@ -46,7 +48,8 @@ module Match
                      git_user_email: nil,
                      clone_branch_directly: false,
                      git_basic_authorization: nil,
-                     git_bearer_authorization: nil)
+                     git_bearer_authorization: nil,
+                     git_private_key: nil)
         self.git_url = git_url
         self.shallow_clone = shallow_clone
         self.skip_docs = skip_docs
@@ -56,6 +59,7 @@ module Match
         self.clone_branch_directly = clone_branch_directly
         self.git_basic_authorization = git_basic_authorization
         self.git_bearer_authorization = git_bearer_authorization
+        self.git_private_key = git_private_key
 
         self.type = type if type
         self.platform = platform if platform
@@ -85,6 +89,16 @@ module Match
           command += " -b #{self.branch.shellescape} --single-branch"
         end
 
+        unless self.git_private_key.nil?
+          if File.file?(self.git_private_key)
+            ssh_add = File.expand_path(self.git_private_key).shellescape.to_s
+          else
+            UI.message("Private key file does not exist, will continue by using it as a raw key.")
+            ssh_add = "- <<< \"#{self.git_private_key}\""
+          end
+          command = "ssh-agent bash -c 'ssh-add #{ssh_add}; #{command}'"
+        end
+
         UI.message("Cloning remote git repo...")
         if self.branch && !self.clone_branch_directly
           UI.message("If cloning the repo takes too long, you can use the `clone_branch_directly` option in match.")

data/pilot/lib/pilot/build_manager.rb

@@ -281,8 +281,17 @@ module Pilot
       changelog
     end
 
+    def self.strip_less_than_sign(changelog)
+      if changelog && changelog.include?("<")
+        changelog.delete!("<")
+        UI.important("Less than signs (<) have been removed from the changelog, since they're not allowed by Apple.")
+      end
+      changelog
+    end
+
     def self.sanitize_changelog(changelog)
       changelog = strip_emoji(changelog)
+      changelog = strip_less_than_sign(changelog)
       truncate_changelog(changelog)
     end