fastlane 2.139.0 → 2.144.0

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
@@ -45,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

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
@@ -110,6 +136,11 @@ module Gym
         Gym.cache[:apps_path] ||= File.join(temporary_output_path, "Apps")
       end
 
+      # The path to the Apps folder
+      def asset_packs_path
+        Gym.cache[:asset_packs_path] ||= File.join(temporary_output_path, "OnDemandResources")
+      end
+
       private
 
       def normalize_export_options(hash)
@@ -160,6 +191,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:")

data/gym/lib/gym/module.rb

@@ -24,6 +24,14 @@ module Gym
       # Import all the fixes
       require 'gym/xcodebuild_fixes/generic_archive_fix'
     end
+
+    def building_mac_catalyst_for_ios?
+      Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "ios"
+    end
+
+    def building_mac_catalyst_for_mac?
+      Gym.project.supports_mac_catalyst? && Gym.config[:catalyst_platform] == "macos"
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/gym/lib/gym/options.rb

@@ -85,6 +85,11 @@ module Gym
                                      description: "Should we skip packaging the ipa?",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_package_pkg,
+                                     env_name: "GYM_SKIP_PACKAGE_PKG",
+                                     description: "Should we skip packaging the pkg?",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :include_symbols,
                                      short_option: "-m",
                                      env_name: "GYM_INCLUDE_SYMBOLS",
@@ -139,6 +144,20 @@ module Gym
                                      description: "Build without codesigning",
                                      type: Boolean,
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :catalyst_platform,
+                                     env_name: "GYM_CATALYST_PLATFORM",
+                                     description: "Platform to build when using a Catalyst enabled app. Valid values are: ios, macos",
+                                     type: String,
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       av = %w(ios macos)
+                                       UI.user_error!("Unsupported export_method '#{value}', must be: #{av}") unless av.include?(value)
+                                     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)`",
+                                     type: String,
+                                     optional: true),
         # Very optional
         FastlaneCore::ConfigItem.new(key: :build_path,
                                      env_name: "GYM_BUILD_PATH",
@@ -255,7 +274,12 @@ module Gym
                                      description: "Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used",
                                      optional: true,
                                      type: Boolean,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
+                                     env_name: "GYM_CLONED_SOURCE_PACKAGES_PATH",
+                                     description: "Sets a custom path for Swift Package Manager dependencies",
+                                     type: String,
+                                     optional: true)
       ]
     end
   end

data/gym/lib/gym/runner.rb

@@ -23,8 +23,13 @@ module Gym
 
       FileUtils.mkdir_p(File.expand_path(Gym.config[:output_directory]))
 
-      if Gym.project.ios? || Gym.project.tvos?
-        fix_generic_archive # See https://github.com/fastlane/fastlane/pull/4325
+      # Determine platform to archive
+      is_mac = Gym.project.mac? || Gym.building_mac_catalyst_for_mac?
+      is_ios = !is_mac && (Gym.project.ios? || Gym.project.tvos? || Gym.project.watchos?)
+
+      # Archive
+      if is_ios
+        fix_generic_archive unless Gym.project.watchos? # See https://github.com/fastlane/fastlane/pull/4325
         return BuildCommandGenerator.archive_path if Gym.config[:skip_package_ipa]
 
         package_app
@@ -34,11 +39,16 @@ module Gym
         move_app_thinning
         move_app_thinning_size_report
         move_apps_folder
-      elsif Gym.project.mac?
+        move_asset_packs
+      elsif is_mac
         path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
-        if Gym.project.mac_app?
-          copy_mac_app
+        if Gym.project.mac_app? || Gym.building_mac_catalyst_for_mac?
+          path = copy_mac_app
+          return path if Gym.config[:skip_package_pkg]
+
+          package_app
+          path = move_pkg
           return path
         end
         copy_files_from_path(File.join(BuildCommandGenerator.archive_path, "Products/usr/local/bin/*")) if Gym.project.command_line_tool?
@@ -160,31 +170,45 @@ module Gym
           dwarfdump_command << "dwarfdump"
           dwarfdump_command << "--uuid #{dsym.shellescape}"
 
+          # Extract uuids
           dwarfdump_result = Helper.backticks(dwarfdump_command.join(" "), print: false)
           architecture_infos = dwarfdump_result.split("\n")
-          architecture_uuids = architecture_infos.map do |info|
-            info_array = info.split(" ")
+          architecture_infos.each do |info|
+            info_array = info.split(" ", 4)
             uuid = info_array[1]
+            dwarf_file_path = info_array[3]
 
             if uuid.nil? || !uuid.match(uuid_regex)
-              nil
-            else
-              uuid
+              next
             end
-          end
 
-          architecture_uuids = architecture_uuids.reject(&:nil?)
-
-          symbol_map_paths = architecture_uuids.map do |uuid|
-            "#{bcsymbolmaps_directory.shellescape}/#{uuid}.bcsymbolmap"
-          end
-
-          symbol_map_paths << bcsymbolmaps_directory.shellescape if symbol_map_paths.empty?
-
-          symbol_map_paths.each do |path|
+            # Find bcsymbolmap file to be used:
+            #  - if a <uuid>.plist file exists, we will extract uuid of bcsymbolmap and use it
+            #  - if a <uuid>.bcsymbolmap file exists, we will use it
+            #  - otherwise let dsymutil figure it out
+            symbol_map_path = nil
+            split_dwarf_file_path = File.split(dwarf_file_path)
+            dsym_plist_file_path = File.join(split_dwarf_file_path[0], "..", "#{uuid}.plist")
+            if File.exist?(dsym_plist_file_path)
+              dsym_plist = Plist.parse_xml(dsym_plist_file_path)
+              original_uuid = dsym_plist['DBGOriginalUUID']
+              possible_symbol_map_path = "#{bcsymbolmaps_directory}/#{original_uuid}.bcsymbolmap"
+              if File.exist?(possible_symbol_map_path)
+                symbol_map_path = possible_symbol_map_path.shellescape
+              end
+            end
+            if symbol_map_path.nil?
+              possible_symbol_map_path = File.join(bcsymbolmaps_directory, "#{uuid}.bcsymbolmap")
+              if File.exist?(possible_symbol_map_path)
+                symbol_map_path = possible_symbol_map_path.shellescape
+              end
+            end
+            if symbol_map_path.nil?
+              symbol_map_path = bcsymbolmaps_directory.shellescape
+            end
             command = []
             command << "dsymutil"
-            command << "--symbol-map #{path}"
+            command << "--symbol-map #{symbol_map_path}"
             command << dsym.shellescape
             Helper.backticks(command.join(" "), print: !Gym.config[:silent])
           end
@@ -212,6 +236,17 @@ module Gym
       ipa_path
     end
 
+    # 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)))
+
+      UI.success("Successfully exported and signed the pkg file:")
+      UI.message(pkg_path)
+      pkg_path
+    end
+
     # copys framework from temp folder:
 
     def copy_files_from_path(path)
@@ -234,6 +269,7 @@ module Gym
     def copy_mac_app
       exe_name = Gym.project.build_settings(key: "EXECUTABLE_NAME")
       app_path = File.join(BuildCommandGenerator.archive_path, "Products/Applications/#{exe_name}.app")
+
       UI.crash!("Couldn't find application in '#{BuildCommandGenerator.archive_path}'") unless File.exist?(app_path)
       FileUtils.cp_r(app_path, File.expand_path(Gym.config[:output_directory]), remove_destination: true)
       app_path = File.join(Gym.config[:output_directory], File.basename(app_path))
@@ -290,6 +326,19 @@ module Gym
       end
     end
 
+    # Move Asset Packs folder to the output directory
+    # @return (String) The path to the resulting Asset Packs (aka OnDemandResources) folder
+    def move_asset_packs
+      if Dir.exist?(PackageCommandGenerator.asset_packs_path)
+        FileUtils.mv(PackageCommandGenerator.asset_packs_path, File.expand_path(Gym.config[:output_directory]), force: true)
+        asset_packs_path = File.join(File.expand_path(Gym.config[:output_directory]), File.basename(PackageCommandGenerator.asset_packs_path))
+
+        UI.success("Successfully exported Asset Pack folder:")
+        UI.message(asset_packs_path)
+        asset_packs_path
+      end
+    end
+
     def find_archive_path
       Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
     end

data/match/lib/match/change_password.rb

@@ -45,7 +45,7 @@ module Match
     end
 
     # This method is called from both here, and from `openssl.rb`
-    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: nil)
+    def self.ask_password(message: "Passphrase for Match storage: ", confirm: nil)
       ensure_ui_interactive
       loop do
         password = UI.password(message)

data/match/lib/match/encryption.rb

@@ -14,6 +14,10 @@ module Match
           },
           "google_cloud" => lambda { |params|
             return nil
+          },
+          "s3" => lambda { |params|
+            params[:keychain_name] = params[:s3_bucket]
+            return Encryption::OpenSSL.configure(params)
           }
         }
       end

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

@@ -71,7 +71,7 @@ module Match
       private
 
       def iterate(source_path)
-        Dir[File.join(source_path, "**", "*.{cer,p12,mobileprovision}")].each do |path|
+        Dir[File.join(source_path, "**", "*.{cer,p12,mobileprovision,provisionprofile}")].each do |path|
           next if File.directory?(path)
           yield(path)
         end

data/match/lib/match/generator.rb

@@ -3,14 +3,20 @@ require_relative 'module'
 module Match
   # Generate missing resources
   class Generator
-    def self.generate_certificate(params, cert_type, working_directory)
+    def self.generate_certificate(params, cert_type, working_directory, specific_cert_type: nil)
       require 'cert/runner'
       require 'cert/options'
 
       output_path = File.join(working_directory, "certs", cert_type.to_s)
 
+      # Mapping match option to cert option for "Developer ID Application"
+      if cert_type.to_sym == :developer_id_application
+        specific_cert_type = cert_type.to_s
+      end
+
       arguments = FastlaneCore::Configuration.create(Cert::Options.available_options, {
         development: params[:type] == "development",
+        type: specific_cert_type,
         generate_apple_certs: params[:generate_apple_certs],
         output_path: output_path,
         force: true, # we don't need a certificate without its private key, we only care about a new certificate
@@ -70,8 +76,15 @@ module Match
       }
 
       values[:platform] = params[:platform]
-      values[:adhoc] = true if prov_type == :adhoc
-      values[:development] = true if prov_type == :development
+
+      # These options are all conflicting so can only set one
+      if params[:type] == "developer_id"
+        values[:developer_id] = true
+      elsif prov_type == :adhoc
+        values[:adhoc] = true
+      elsif prov_type == :development
+        values[:development] = true
+      end
 
       arguments = FastlaneCore::Configuration.create(Sigh::Options.available_options, values)
 
@@ -82,6 +95,7 @@ module Match
 
     # @return the name of the provisioning profile type
     def self.profile_type_name(type)
+      return "Direct" if type == :developer_id
       return "Development" if type == :development
       return "AdHoc" if type == :adhoc
       return "AppStore" if type == :appstore