fastlane 2.178.0 → 2.179.0

data/fastlane/swift/Gymfile.swift

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

data/fastlane/swift/GymfileProtocol.swift

@@ -196,4 +196,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.64]
+// FastlaneRunnerAPIVersion [0.9.65]

data/fastlane/swift/Matchfile.swift

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

data/fastlane/swift/MatchfileProtocol.swift

@@ -184,4 +184,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.58]
+// FastlaneRunnerAPIVersion [0.9.59]

data/fastlane/swift/Precheckfile.swift

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

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -12,7 +12,7 @@ public protocol PrecheckfileProtocol: class {
     var appIdentifier: String { get }
 
     /// Your Apple ID Username
-    var username: String { get }
+    var username: String? { get }
 
     /// The ID of your App Store Connect team if you're in multiple teams
     var teamId: String? { get }
@@ -40,7 +40,7 @@ public extension PrecheckfileProtocol {
     var apiKeyPath: String? { return nil }
     var apiKey: [String: Any]? { return nil }
     var appIdentifier: String { return "" }
-    var username: String { return "" }
+    var username: String? { return nil }
     var teamId: String? { return nil }
     var teamName: String? { return nil }
     var platform: String { return "ios" }
@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.57]
+// FastlaneRunnerAPIVersion [0.9.58]

data/fastlane/swift/Scanfile.swift

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

data/fastlane/swift/ScanfileProtocol.swift

@@ -288,4 +288,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.69]
+// FastlaneRunnerAPIVersion [0.9.70]

data/fastlane/swift/Screengrabfile.swift

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

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.59]
+// FastlaneRunnerAPIVersion [0.9.60]

data/fastlane/swift/Snapshotfile.swift

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

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -196,4 +196,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.53]
+// FastlaneRunnerAPIVersion [0.9.54]

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -2,7 +2,7 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.47.12",
+        "version": "0.47.13",
         "bottle": {
           "rebuild": 0,
           "cellar": ":any_skip_relocation",
@@ -10,20 +10,20 @@
           "root_url": "https://homebrew.bintray.com/bottles",
           "files": {
             "arm64_big_sur": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.arm64_big_sur.bottle.tar.gz",
-              "sha256": "334b736f7c78b1bc48882f55558e79571be591281462bc91dedea6dac10034be"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.13.arm64_big_sur.bottle.tar.gz",
+              "sha256": "fdcdb5e94b9c4d66a32d4515ba3d2db4057865f96aefab0e41fdeaf2879f4f89"
             },
             "big_sur": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.big_sur.bottle.tar.gz",
-              "sha256": "b7ba5043f29c548dd05374125faa61dd07690bffe373890cb608609e4a7e2413"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.13.big_sur.bottle.tar.gz",
+              "sha256": "cbb7a9803926d8bfaacf5c1a7d4cd07d8fe2255b1885be3ae2ffd8414e4c5292"
             },
             "catalina": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.catalina.bottle.tar.gz",
-              "sha256": "030b2e18168f5680c4ee387812b14057c4cb148b6f6800b983b1b298f4af15b1"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.13.catalina.bottle.tar.gz",
+              "sha256": "3a13e9b1f4a63bc03601897944f71dd4e6942788531dc060322d20fc6b36d2fd"
             },
             "mojave": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.mojave.bottle.tar.gz",
-              "sha256": "b3e35821d3094d08eb9f8423ce7d18cb5462bb5b1d02a3156ed1a10f6539709a"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.13.mojave.bottle.tar.gz",
+              "sha256": "4e0691f12a5ef3b01eba9f41091b8f3457bc65151bfad057a45e8de9525074cd"
             }
           }
         }
@@ -33,9 +33,9 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "3.0.4-64-g31a4989",
+        "HOMEBREW_VERSION": "3.0.9-4-g9308a25",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "443ddf805144323198a5b37b071516534243377b",
+        "Homebrew/homebrew-core": "2e6c683b1705308ab02e71f996733b1ad05942d0",
         "CLT": "11.0.33.12",
         "Xcode": "12.2",
         "macOS": "10.15.7"

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

@@ -208,8 +208,10 @@ module FastlaneCore
     #####################################################
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
-    # if 'ask' is true and the value is not present, the user will be prompted to provide a value
-    def fetch(key, ask: true)
+    # if 'ask' is true and the value is not present, the user will be prompted to provide a value if optional
+    # if 'force_ask' is true, the option is not required to be optional to ask
+    # rubocop:disable Metrics/PerceivedComplexity
+    def fetch(key, ask: true, force_ask: false)
       UI.crash!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
 
       option = verify_options_key!(key)
@@ -227,7 +229,7 @@ module FastlaneCore
 
       value = option.auto_convert_value(value)
       value = nil if value.nil? && !option.string? # by default boolean flags are false
-      return value unless value.nil? && !option.optional && ask
+      return value unless value.nil? && (!option.optional || force_ask) && ask
 
       # fallback to asking
       if Helper.test? || !UI.interactive?

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -75,7 +75,7 @@ module FastlaneCore
 
       # Check for Jenkins, Travis CI, ... environment variables
       ['JENKINS_HOME', 'JENKINS_URL', 'TRAVIS', 'CI', 'APPCENTER_BUILD_ID', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey', 'GITLAB_CI', 'XCS', 'TF_BUILD', 'GITHUB_ACTION', 'GITHUB_ACTIONS', 'BITRISE_IO', 'BUDDY'].each do |current|
-        return true if ENV.key?(current)
+        return true if FastlaneCore::Env.truthy?(current)
       end
       return false
     end
@@ -377,6 +377,8 @@ module FastlaneCore
 
     # returns the path of the executable with the correct extension on Windows
     def self.get_executable_path(cmd_path)
+      cmd_path = localize_file_path(cmd_path)
+
       if self.windows?
         # PATHEXT contains the list of file extensions that Windows considers executable, semicolon separated.
         # e.g. ".COM;.EXE;.BAT;.CMD"
@@ -393,6 +395,12 @@ module FastlaneCore
       return cmd_path
     end
 
+    # returns the path with the platform-specific path separator (`/` on UNIX, `\` on Windows)
+    def self.localize_file_path(path)
+      # change `/` to `\` on Windows
+      return self.windows? ? path.gsub('/', '\\') : path
+    end
+
     # checks if given file is a valid json file
     # base taken from: http://stackoverflow.com/a/26235831/1945875
     def self.json_file?(filename)
@@ -462,5 +470,20 @@ module FastlaneCore
         UI.error("Your entries do not match. Please try again")
       end
     end
+
+    # URI.open added by `require 'open-uri'` is not available in Ruby 2.4. This helper lets you open a URI
+    # by choosing appropriate interface to do so depending on Ruby version. This helper is subject to be removed
+    # when fastlane drops Ruby 2.4 support.
+    def self.open_uri(*rest, &block)
+      require 'open-uri'
+
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5')
+        dup = rest.dup
+        uri = dup.shift
+        URI.parse(uri).open(*dup, &block)
+      else
+        URI.open(*rest, &block)
+      end
+    end
   end
 end

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

@@ -29,6 +29,10 @@ module Gym
         generator.pkg_path
       end
 
+      def binary_path
+        generator.binary_path
+      end
+
       def dsym_path
         generator.dsym_path
       end

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

@@ -81,28 +81,33 @@ module Gym
         Gym.cache[:ipa_path]
       end
 
-      def pkg_path
-        path = Gym.cache[:pkg_path]
+      def binary_path
+        path = Gym.cache[:binary_path]
         return path if path
 
         path = Dir[File.join(temporary_output_path, "*.pkg")].last
-        # We need to process generic PKG
+        app_path = Dir[File.join(temporary_output_path, "*.app")].last
+        # We need to process generic PKG or APP
         if path
           # Try to find PKG file in the output directory, used when app thinning was not set
-          Gym.cache[:pkg_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.pkg")
-          FileUtils.mv(path, Gym.cache[:pkg_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:pkg_path]).downcase).zero?
+          Gym.cache[:binary_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.pkg")
+          FileUtils.mv(path, Gym.cache[:binary_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:binary_path]).downcase).zero?
         elsif Dir.exist?(apps_path)
           # Try to find "generic" PKG file inside "Apps" folder, used when app thinning was set
           files = Dir[File.join(apps_path, "*.pkg")]
           # Generic PKG file doesn't have suffix so its name is the shortest
           path = files.min_by(&:length)
-          Gym.cache[:pkg_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.pkg")
-          FileUtils.cp(path, Gym.cache[:pkg_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:pkg_path]).downcase).zero?
+          Gym.cache[:binary_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.pkg")
+          FileUtils.cp(path, Gym.cache[:binary_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:binary_path]).downcase).zero?
+        elsif app_path
+          # Try to find .app file in the output directory. This is used when macOS is set and .app is being generated.
+          Gym.cache[:binary_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.app")
+          FileUtils.mv(app_path, Gym.cache[:binary_path]) unless File.expand_path(app_path).casecmp(File.expand_path(Gym.cache[:binary_path]).downcase).zero?
         else
           ErrorHandler.handle_empty_pkg unless path
         end
 
-        Gym.cache[:pkg_path]
+        Gym.cache[:binary_path]
       end
 
       # The path the the dsym file for this app. Might be nil

data/gym/lib/gym/runner.rb

@@ -243,12 +243,12 @@ module Gym
     # Moves over the binary and dsym file to the output directory
     # @return (String) The path to the resulting pkg file
     def move_pkg
-      FileUtils.mv(PackageCommandGenerator.pkg_path, File.expand_path(Gym.config[:output_directory]), force: true)
-      pkg_path = File.expand_path(File.join(Gym.config[:output_directory], File.basename(PackageCommandGenerator.pkg_path)))
+      FileUtils.mv(PackageCommandGenerator.binary_path, File.expand_path(Gym.config[:output_directory]), force: true)
+      binary_path = File.expand_path(File.join(Gym.config[:output_directory], File.basename(PackageCommandGenerator.binary_path)))
 
       UI.success("Successfully exported and signed the pkg file:")
-      UI.message(pkg_path)
-      pkg_path
+      UI.message(binary_path)
+      binary_path
     end
 
     # copys framework from temp folder:
@@ -274,6 +274,13 @@ module Gym
       exe_name = Gym.project.build_settings(key: "EXECUTABLE_NAME")
       app_path = File.join(BuildCommandGenerator.archive_path, "Products/Applications/#{exe_name}.app")
 
+      unless File.exist?(app_path)
+        # Apparently the `EXECUTABLE_NAME` is not correct. This can happen when building a workspace which has a project
+        # earlier in the build order that has a different `EXECUTABLE_NAME` than the app. Try to find the last `.app` as
+        # a fallback for this situation.
+        app_path = Dir[File.join(BuildCommandGenerator.archive_path, "Products", "Applications", "*.app")].last
+      end
+
       UI.crash!("Couldn't find application in '#{BuildCommandGenerator.archive_path}'") unless File.exist?(app_path)
 
       joined_app_path = File.join(Gym.config[:output_directory], File.basename(app_path))

data/match/lib/match/change_password.rb

@@ -16,7 +16,7 @@ module Match
 
       ensure_ui_interactive
 
-      to = FastlaneCore::Helper.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
+      new_password = FastlaneCore::Helper.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
 
       # Choose the right storage and encryption implementations
       storage = Storage.for_mode(params[:storage_mode], {
@@ -37,10 +37,10 @@ module Match
       encryption.decrypt_files
 
       encryption.clear_password
-      encryption.store_password(to)
+      encryption.store_password(new_password)
 
       message = "[fastlane] Changed passphrase"
-      files_to_commit = encryption.encrypt_files
+      files_to_commit = encryption.encrypt_files(new_password)
       storage.save_changes!(files_to_commit: files_to_commit, custom_message: message)
     end
 

data/match/lib/match/encryption/interface.rb

@@ -3,7 +3,7 @@ module Match
     class Interface
       # Call this method to trigger the actual
       # encryption
-      def encrypt_files
+      def encrypt_files(password: nil)
         not_implemented(__method__)
       end
 

data/match/lib/match/encryption/openssl.rb

@@ -28,9 +28,9 @@ module Match
         self.working_directory = working_directory
       end
 
-      def encrypt_files
+      def encrypt_files(password: nil)
         files = []
-        password = fetch_password!
+        password ||= fetch_password!
         iterate(self.working_directory) do |current|
           files << current
           encrypt_specific_file(path: current, password: password)

data/match/lib/match/module.rb

@@ -21,6 +21,7 @@ module Match
   end
 
   def self.cert_type_sym(type)
+    type = type.to_s
     return :mac_installer_distribution if type == "mac_installer_distribution"
     return :developer_id_installer if type == "developer_id_installer"
     return :developer_id_application if type == "developer_id"

data/pilot/lib/pilot/manager.rb

@@ -23,6 +23,10 @@ module Pilot
       else
         config[:username] ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
+        # Username is now optional since addition of App Store Connect API Key
+        # Force asking for username to prompt user if not already set
+        config.fetch(:username, force_ask: true)
+
         UI.message("Login to App Store Connect (#{config[:username]})")
         Spaceship::ConnectAPI.login(config[:username], use_portal: false, use_tunes: true, tunes_team_id: config[:team_id], team_name: config[:team_name])
         UI.message("Login successful")

data/pilot/lib/pilot/options.rb

@@ -31,6 +31,7 @@ module Pilot
                                      short_option: "-u",
                                      env_name: "PILOT_USERNAME",
                                      description: "Your Apple ID Username",
+                                     optional: true,
                                      default_value: user,
                                      default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :app_identifier,

data/precheck/lib/precheck/options.rb

@@ -52,6 +52,7 @@ module Precheck
                                      short_option: "-u",
                                      env_name: "PRECHECK_USERNAME",
                                      description: "Your Apple ID Username",
+                                     optional: true,
                                      default_value: user,
                                      default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :team_id,

data/precheck/lib/precheck/runner.rb

@@ -32,6 +32,10 @@ module Precheck
         UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
       elsif Spaceship::Tunes.client.nil?
+        # Username is now optional since addition of App Store Connect API Key
+        # Force asking for username to prompt user if not already set
+        Precheck.config.fetch(:username, force_ask: true)
+
         # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
         # Prompts select team if multiple teams and none specified
         UI.message("Starting login with user '#{Precheck.config[:username]}'")

data/screengrab/lib/screengrab/android_environment.rb

@@ -34,22 +34,22 @@ module Screengrab
     def find_platform_tools(android_home)
       return nil unless android_home
 
-      platform_tools_path = File.join(android_home, 'platform-tools')
+      platform_tools_path = Helper.localize_file_path(File.join(android_home, 'platform-tools'))
       File.directory?(platform_tools_path) ? platform_tools_path : nil
     end
 
     def find_build_tools(android_home, build_tools_version)
       return nil unless android_home
 
-      build_tools_dir = File.join(android_home, 'build-tools')
+      build_tools_dir = Helper.localize_file_path(File.join(android_home, 'build-tools'))
 
       return nil unless build_tools_dir && File.directory?(build_tools_dir)
 
-      return File.join(build_tools_dir, build_tools_version) if build_tools_version
+      return Helper.localize_file_path(File.join(build_tools_dir, build_tools_version)) if build_tools_version
 
       version = select_build_tools_version(build_tools_dir)
 
-      return version ? File.join(build_tools_dir, version) : nil
+      return version ? Helper.localize_file_path(File.join(build_tools_dir, version)) : nil
     end
 
     def select_build_tools_version(build_tools_dir)
@@ -74,6 +74,7 @@ module Screengrab
       return FastlaneCore::CommandExecutor.which('adb') unless platform_tools_path
 
       adb_path = Helper.get_executable_path(File.join(platform_tools_path, 'adb'))
+      adb_path = Helper.localize_file_path(adb_path)
       return executable_command?(adb_path) ? adb_path : nil
     end
 
@@ -81,6 +82,7 @@ module Screengrab
       return FastlaneCore::CommandExecutor.which('aapt') unless build_tools_path
 
       aapt_path = Helper.get_executable_path(File.join(build_tools_path, 'aapt'))
+      aapt_path = Helper.localize_file_path(aapt_path)
       return executable_command?(aapt_path) ? aapt_path : nil
     end