fastlane 2.140.0 → 2.141.0

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/GymfileProtocol.swift

@@ -30,6 +30,9 @@ protocol GymfileProtocol: class {
   /// Should we skip packaging the ipa?
   var skipPackageIpa: Bool { get }
 
+  /// Should we skip packaging the pkg?
+  var skipPackagePkg: Bool { get }
+
   /// Should the ipa file include symbols?
   var includeSymbols: Bool? { get }
 
@@ -54,6 +57,12 @@ protocol GymfileProtocol: class {
   /// Build without codesigning
   var skipCodesigning: Bool? { get }
 
+  /// 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)`
+  var installerCertName: String? { get }
+
   /// The directory in which the archive should be stored in
   var buildPath: String? { get }
 
@@ -119,6 +128,9 @@ protocol GymfileProtocol: class {
 
   /// Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
   var skipProfileDetection: Bool { get }
+
+  /// Sets a custom path for Swift Package Manager dependencies
+  var clonedSourcePackagesPath: String? { get }
 }
 
 extension GymfileProtocol {
@@ -132,6 +144,7 @@ extension GymfileProtocol {
   var silent: Bool { return false }
   var codesigningIdentity: String? { return nil }
   var skipPackageIpa: Bool { return false }
+  var skipPackagePkg: Bool { return false }
   var includeSymbols: Bool? { return nil }
   var includeBitcode: Bool? { return nil }
   var exportMethod: String? { return nil }
@@ -140,6 +153,8 @@ extension GymfileProtocol {
   var skipBuildArchive: Bool? { return nil }
   var skipArchive: Bool? { return nil }
   var skipCodesigning: Bool? { return nil }
+  var catalystPlatform: String? { return nil }
+  var installerCertName: String? { return nil }
   var buildPath: String? { return nil }
   var archivePath: String? { return nil }
   var derivedDataPath: String? { return nil }
@@ -162,8 +177,9 @@ extension GymfileProtocol {
   var analyzeBuildTime: Bool? { return nil }
   var xcprettyUtf: Bool? { return nil }
   var skipProfileDetection: Bool { return false }
+  var clonedSourcePackagesPath: String? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.17]
+// FastlaneRunnerAPIVersion [0.9.18]

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -1,8 +1,11 @@
 protocol MatchfileProtocol: class {
 
-  /// Define the profile type, can be appstore, adhoc, development, enterprise
+  /// Define the profile type, can be appstore, adhoc, development, enterprise, developer_id
   var type: String { get }
 
+  /// Create additional cert types needed for macOS installers (valid values: mac_installer_distribution, developer_id_installer)
+  var additionalCertTypes: [String]? { get }
+
   /// Only fetch existing certificates and profiles, don't generate new ones
   var readonly: Bool { get }
 
@@ -78,7 +81,7 @@ protocol MatchfileProtocol: class {
   /// Skip generation of a README.md for the created git repository
   var skipDocs: Bool { get }
 
-  /// Set the provisioning profile's platform to work with (i.e. ios, tvos)
+  /// Set the provisioning profile's platform to work with (i.e. ios, tvos, macos)
   var platform: String { get }
 
   /// 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")
@@ -93,6 +96,7 @@ protocol MatchfileProtocol: class {
 
 extension MatchfileProtocol {
   var type: String { return "development" }
+  var additionalCertTypes: [String]? { return nil }
   var readonly: Bool { return false }
   var generateAppleCerts: Bool { return true }
   var skipProvisioningProfiles: Bool { return false }
@@ -126,4 +130,4 @@ extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.12]
+// FastlaneRunnerAPIVersion [0.9.13]

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -168,6 +168,9 @@ protocol ScanfileProtocol: class {
   /// Allows for override of the default `xcodebuild` command
   var xcodebuildCommand: String { get }
 
+  /// Sets a custom path for Swift Package Manager dependencies
+  var clonedSourcePackagesPath: String? { get }
+
   /// Should this step stop the build if the tests fail? Set this to false if you're using trainer
   var failBuild: Bool { get }
 }
@@ -229,9 +232,10 @@ extension ScanfileProtocol {
   var destination: String? { return nil }
   var customReportFileName: String? { return nil }
   var xcodebuildCommand: String { return "env NSUnbufferedIO=YES xcodebuild" }
+  var clonedSourcePackagesPath: String? { return nil }
   var failBuild: Bool { return true }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.24]
+// FastlaneRunnerAPIVersion [0.9.25]

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.140.0
+// Generated with fastlane 2.141.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -101,6 +101,12 @@ protocol SnapshotfileProtocol: class {
 
   /// Take snapshots on multiple simulators concurrently. Note: This option is only applicable when running against Xcode 9
   var concurrentSimulators: Bool { get }
+
+  /// Disable the simulator from showing the 'Slide to type' prompt
+  var disableSlideToType: Bool { get }
+
+  /// Sets a custom path for Swift Package Manager dependencies
+  var clonedSourcePackagesPath: String? { get }
 }
 
 extension SnapshotfileProtocol {
@@ -138,8 +144,10 @@ extension SnapshotfileProtocol {
   var testTargetName: String? { return nil }
   var namespaceLogFiles: String? { return nil }
   var concurrentSimulators: Bool { return true }
+  var disableSlideToType: Bool { return false }
+  var clonedSourcePackagesPath: String? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.6]
+// FastlaneRunnerAPIVersion [0.9.7]

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -10,6 +10,7 @@ module FastlaneCore
       UI.user_error!("Could not find file '#{path}'") unless File.exist?(path)
 
       ids = installed_identies(in_keychain: in_keychain)
+      ids += installed_installers(in_keychain: in_keychain)
       finger_print = sha1_fingerprint(path)
 
       return ids.include?(finger_print)
@@ -47,12 +48,39 @@ module FastlaneCore
       return ids
     end
 
+    def self.installed_installers(in_keychain: nil)
+      available = self.list_available_third_party_mac_installer(in_keychain: in_keychain)
+      available += self.list_available_developer_id_installer(in_keychain: in_keychain)
+
+      return available.scan(/^SHA-1 hash: ([[:xdigit:]]+)$/).flatten
+    end
+
     def self.list_available_identities(in_keychain: nil)
+      # -v  Show valid identities only (default is to show all identities)
+      # -p  Specify policy to evaluate
       commands = ['security find-identity -v -p codesigning']
       commands << in_keychain if in_keychain
       `#{commands.join(' ')}`
     end
 
+    def self.list_available_third_party_mac_installer(in_keychain: nil)
+      # -Z  Print SHA-256 (and SHA-1) hash of the certificate
+      # -a  Find all matching certificates, not just the first one
+      # -c  Match on "name" when searching (optional)
+      commands = ['security find-certificate -Z -a -c "3rd Party Mac Developer Installer"']
+      commands << in_keychain if in_keychain
+      `#{commands.join(' ')}`
+    end
+
+    def self.list_available_developer_id_installer(in_keychain: nil)
+      # -Z  Print SHA-256 (and SHA-1) hash of the certificate
+      # -a  Find all matching certificates, not just the first one
+      # -c  Match on "name" when searching (optional)
+      commands = ['security find-certificate -Z -a -c "Developer ID Installer"']
+      commands << in_keychain if in_keychain
+      `#{commands.join(' ')}`
+    end
+
     def self.wwdr_certificate_installed?
       certificate_name = "Apple Worldwide Developer Relations Certification Authority"
       keychain = wwdr_keychain

data/fastlane_core/lib/fastlane_core/project.rb

@@ -1,5 +1,6 @@
 require_relative 'helper'
 require 'xcodeproj'
+require 'fastlane_core/command_executor'
 
 module FastlaneCore
   # Represents an Xcode project
@@ -273,6 +274,10 @@ module FastlaneCore
       (framework? && build_settings(key: "PLATFORM_NAME") == "macosx")
     end
 
+    def supports_mac_catalyst?
+      build_settings(key: "SUPPORTS_MACCATALYST") == "YES"
+    end
+
     def command_line_tool?
       (build_settings(key: "PRODUCT_TYPE") == "com.apple.product-type.tool")
     end
@@ -313,6 +318,10 @@ module FastlaneCore
       proj << "-configuration #{options[:configuration].shellescape}" if options[:configuration]
       proj << "-xcconfig #{options[:xcconfig].shellescape}" if options[:xcconfig]
 
+      if FastlaneCore::Helper.xcode_at_least?('11.0') && options[:cloned_source_packages_path]
+        proj << "-clonedSourcePackagesDirPath #{options[:cloned_source_packages_path].shellescape}"
+      end
+
       return proj
     end
 
@@ -335,6 +344,12 @@ module FastlaneCore
       command
     end
 
+    def build_xcodebuild_resolvepackagedependencies_command
+      command = "xcodebuild -resolvePackageDependencies #{xcodebuild_parameters.join(' ')}"
+      command += " 2> /dev/null" if xcodebuild_suppress_stderr
+      command
+    end
+
     # Get the build settings for our project
     # e.g. to properly get the DerivedData folder
     # @param [String] The key of which we want the value for (e.g. "PRODUCT_NAME")
@@ -347,6 +362,14 @@ module FastlaneCore
           options[:scheme] ||= schemes.first
         end
 
+        # SwiftPM support
+        if FastlaneCore::Helper.xcode_at_least?('11.0')
+          UI.important("Resolving Swift Package Manager dependencies...")
+          FastlaneCore::CommandExecutor.execute(command: build_xcodebuild_resolvepackagedependencies_command,
+                                                print_all: true,
+                                                print_command: !self.xcodebuild_list_silent)
+        end
+
         command = build_xcodebuild_showbuildsettings_command
 
         # Xcode might hang here and retrying fixes the problem, see fastlane#4059

data/gym/lib/gym/code_signing_mapping.rb

@@ -88,6 +88,13 @@ module Gym
       when "tvOS"
         destination_sdkroot = ["appletvos"]
       end
+
+      # Catalyst projects will always have an "iphoneos" sdkroot
+      # Need to force a same platform when trying to build as macos
+      if Gym.building_mac_catalyst_for_mac?
+        return true
+      end
+
       return destination_sdkroot.include?(sdkroot)
     end
 
@@ -134,10 +141,31 @@ module Gym
               next unless same_platform?(sdkroot)
               next unless specified_configuration == build_configuration.name
 
-              bundle_identifier = build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER", target)
+              # Catalyst apps will have some build settings that will have a configuration
+              # that is specfic for macos so going to do our best to capture those
+              #
+              # There are other platform filters besides "[sdk=macosx*]" that we could use but
+              # this is the default that Xcode will use so this will also be our default
+              sdk_specifier = Gym.building_mac_catalyst_for_mac? ? "[sdk=macosx*]" : ""
+
+              # Look for sdk specific bundle identifier (if set) and fallback to general configuration if none
+              bundle_identifier = build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER#{sdk_specifier}", target)
+              bundle_identifier ||= build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER", target)
               next unless bundle_identifier
-              provisioning_profile_specifier = build_configuration.resolve_build_setting("PROVISIONING_PROFILE_SPECIFIER", target)
-              provisioning_profile_uuid = build_configuration.resolve_build_setting("PROVISIONING_PROFILE", target)
+
+              # Xcode prefixes "maccatalyst." if building a Catalyst app for mac and
+              # if DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER is set to YES
+              if Gym.building_mac_catalyst_for_mac? && build_configuration.resolve_build_setting("DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER", target) == "YES"
+                bundle_identifier = "maccatalyst.#{bundle_identifier}"
+              end
+
+              # Look for sdk specific provisioning profile specifier (if set) and fallback to general configuration if none
+              provisioning_profile_specifier = build_configuration.resolve_build_setting("PROVISIONING_PROFILE_SPECIFIER#{sdk_specifier}", target)
+              provisioning_profile_specifier ||= build_configuration.resolve_build_setting("PROVISIONING_PROFILE_SPECIFIER", target)
+
+              # Look for sdk specific provisioning profile uuid (if set) and fallback to general configuration if none
+              provisioning_profile_uuid = build_configuration.resolve_build_setting("PROVISIONING_PROFILE#{sdk_specifier}", target)
+              provisioning_profile_uuid ||= build_configuration.resolve_build_setting("PROVISIONING_PROFILE", target)
 
               has_profile_specifier = provisioning_profile_specifier.to_s.length > 0
               has_profile_uuid = provisioning_profile_uuid.to_s.length > 0
@@ -177,5 +205,6 @@ module Gym
 
       return provisioning_profile_mapping
     end
+    # rubocop:enable Metrics/PerceivedComplexity
   end
 end

data/gym/lib/gym/detect_values.rb

@@ -33,6 +33,7 @@ module Gym
       detect_selected_provisioning_profiles # we can only do that *after* we have the platform
       detect_configuration
       detect_toolchain
+      detect_third_party_installer
 
       config[:output_name] ||= Gym.project.app_name
 
@@ -100,6 +101,38 @@ module Gym
       end
     end
 
+    # Detects name of a "3rd Party Mac Developer Installer" cert for the configured team id
+    def self.detect_third_party_installer
+      return if Gym.config[:installer_cert_name]
+
+      team_id = Gym.config[:export_team_id] || Gym.project.build_settings(key: "DEVELOPMENT_TEAM")
+      return if team_id.nil?
+
+      case Gym.config[:export_method]
+      when "app-store"
+        prefix = "3rd Party Mac Developer Installer: "
+      when "developer-id"
+        prefix = "Developer ID Installer: "
+      else
+        return
+      end
+
+      output = Helper.backticks("security find-certificate -a -c \"#{prefix}\"", print: false)
+
+      # Find matches, filter by team_id, prepend prefix for full cert name
+      certs = output.scan(/"(?:#{prefix})(.*)"/)
+      certs = certs.flatten.uniq.select do |cert|
+        cert.include?(team_id)
+      end.map do |cert|
+        prefix + cert
+      end
+
+      if certs.first
+        UI.verbose("Detected installer certificate to use: #{certs.first}")
+        Gym.config[:installer_cert_name] = certs.first
+      end
+    end
+
     def self.detect_scheme
       Gym.project.select_scheme
     end
@@ -111,14 +144,13 @@ module Gym
     # Is it an iOS device or a Mac?
     def self.detect_platform
       return if Gym.config[:destination]
-      platform = if Gym.project.mac?
+      platform = if Gym.project.mac? || Gym.building_mac_catalyst_for_mac?
                    min_xcode8? ? "macOS" : "OS X"
                  elsif Gym.project.tvos?
                    "tvOS"
                  else
                    "iOS"
                  end
-
       Gym.config[:destination] = "generic/platform=#{platform}"
     end
 

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

@@ -25,6 +25,10 @@ module Gym
         generator.ipa_path
       end
 
+      def pkg_path
+        generator.pkg_path
+      end
+
       def dsym_path
         generator.dsym_path
       end

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

@@ -58,27 +58,53 @@ module Gym
       end
 
       def ipa_path
-        unless Gym.cache[:ipa_path]
-          path = Dir[File.join(temporary_output_path, "*.ipa")].last
-          # We need to process generic IPA
-          if path
-            # Try to find IPA file in the output directory, used when app thinning was not set
-            Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-            FileUtils.mv(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
-          elsif Dir.exist?(apps_path)
-            # Try to find "generic" IPA file inside "Apps" folder, used when app thinning was set
-            files = Dir[File.join(apps_path, "*.ipa")]
-            # Generic IPA file doesn't have suffix so its name is the shortest
-            path = files.min_by(&:length)
-            Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-            FileUtils.cp(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
-          else
-            ErrorHandler.handle_empty_archive unless path
-          end
+        path = Gym.cache[:ipa_path]
+        return path if path
+
+        path = Dir[File.join(temporary_output_path, "*.ipa")].last
+        # We need to process generic IPA
+        if path
+          # Try to find IPA file in the output directory, used when app thinning was not set
+          Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
+          FileUtils.mv(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
+        elsif Dir.exist?(apps_path)
+          # Try to find "generic" IPA file inside "Apps" folder, used when app thinning was set
+          files = Dir[File.join(apps_path, "*.ipa")]
+          # Generic IPA file doesn't have suffix so its name is the shortest
+          path = files.min_by(&:length)
+          Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
+          FileUtils.cp(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
+        else
+          ErrorHandler.handle_empty_archive unless path
         end
+
         Gym.cache[:ipa_path]
       end
 
+      def pkg_path
+        path = Gym.cache[:pkg_path]
+        return path if path
+
+        path = Dir[File.join(temporary_output_path, "*.pkg")].last
+        # We need to process generic PKG
+        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?
+        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?
+        else
+          ErrorHandler.handle_empty_archive unless path
+        end
+
+        Gym.cache[:pkg_path]
+      end
+
       # The path the the dsym file for this app. Might be nil
       def dsym_path
         Dir[BuildCommandGenerator.archive_path + "/**/*.app.dSYM"].last
@@ -160,6 +186,10 @@ module Gym
           hash[:signingStyle] = 'manual'
         end
 
+        if Gym.config[:installer_cert_name] && (Gym.project.mac? || Gym.building_mac_catalyst_for_mac?)
+          hash[:installerSigningCertificate] = Gym.config[:installer_cert_name]
+        end
+
         hash[:teamID] = Gym.config[:export_team_id] if Gym.config[:export_team_id]
 
         UI.important("Generated plist file with the following values:")