fastlane 2.140.0 → 2.141.0

data/fastlane/lib/fastlane/actions/build_ios_app.rb

@@ -1,150 +1,46 @@
 module Fastlane
   module Actions
-    module SharedValues
-      IPA_OUTPUT_PATH ||= :IPA_OUTPUT_PATH
-      DSYM_OUTPUT_PATH ||= :DSYM_OUTPUT_PATH
-      XCODEBUILD_ARCHIVE ||= :XCODEBUILD_ARCHIVE # originally defined in XcodebuildAction
-    end
-
-    class BuildIosAppAction < Action
-      def self.run(values)
-        require 'gym'
-
-        unless Actions.lane_context[SharedValues::SIGH_PROFILE_TYPE].to_s == "development"
-          values[:export_method] ||= Actions.lane_context[SharedValues::SIGH_PROFILE_TYPE]
-        end
-
-        if Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]
-          # Since Xcode 9 you need to explicitly provide the provisioning profile per app target
-          # If the user is smart and uses match and gym together with fastlane, we can do all
-          # the heavy lifting for them
-          values[:export_options] ||= {}
-          # It's not always a hash, because the user might have passed a string path to a ready plist file
-          # If that's the case, we won't set the provisioning profiles
-          # see https://github.com/fastlane/fastlane/issues/9490
-          if values[:export_options].kind_of?(Hash)
-            match_mapping = (Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING] || {}).dup
-            existing_mapping = (values[:export_options][:provisioningProfiles] || {}).dup
-
-            # Be smart about how we merge those mappings in case there are conflicts
-            mapping_object = Gym::CodeSigningMapping.new
-            hash_to_use = mapping_object.merge_profile_mapping(primary_mapping: existing_mapping,
-                                                             secondary_mapping: match_mapping,
-                                                                export_method: values[:export_method])
-
-            values[:export_options][:provisioningProfiles] = hash_to_use
-          else
-            self.show_xcode_9_warning
-          end
-        elsif Actions.lane_context[SharedValues::SIGH_PROFILE_PATHS]
-          # Since Xcode 9 you need to explicitly provide the provisioning profile per app target
-          # If the user used sigh we can match the profiles from sigh
-          values[:export_options] ||= {}
-          if values[:export_options].kind_of?(Hash)
-            # It's not always a hash, because the user might have passed a string path to a ready plist file
-            # If that's the case, we won't set the provisioning profiles
-            # see https://github.com/fastlane/fastlane/issues/9684
-            values[:export_options][:provisioningProfiles] ||= {}
-            Actions.lane_context[SharedValues::SIGH_PROFILE_PATHS].each do |profile_path|
-              begin
-                profile = FastlaneCore::ProvisioningProfile.parse(profile_path)
-                app_id_prefix = profile["ApplicationIdentifierPrefix"].first
-                bundle_id = profile["Entitlements"]["application-identifier"].gsub("#{app_id_prefix}.", "")
-                values[:export_options][:provisioningProfiles][bundle_id] = profile["Name"]
-              rescue => ex
-                UI.error("Couldn't load profile at path: #{profile_path}")
-                UI.error(ex)
-                UI.verbose(ex.backtrace.join("\n"))
-              end
-            end
-          else
-            self.show_xcode_9_warning
-          end
+    require 'fastlane/actions/build_app'
+    class BuildIosAppAction < BuildAppAction
+      # Gym::Options.available_options keys that don't apply to ios apps.
+      REJECT_OPTIONS = [
+        :pkg,
+        :skip_package_pkg,
+        :catalyst_platform,
+        :installer_cert_name
+      ]
+
+      def self.run(params)
+        # Adding reject options back in  so gym has everything it needs
+        params.available_options += Gym::Options.available_options.select do |option|
+          REJECT_OPTIONS.include?(option.key)
         end
 
-        gym_output_path = Gym::Manager.new.work(values)
-        if gym_output_path.nil?
-          UI.important("No output path received from gym")
-          return nil
-        end
-
-        absolute_ipa_path = File.expand_path(gym_output_path)
-        absolute_dsym_path = absolute_ipa_path.gsub(".ipa", ".app.dSYM.zip")
-
-        # This might be the mac app path, so we don't want to set it here
-        # https://github.com/fastlane/fastlane/issues/5757
-        if absolute_ipa_path.include?(".ipa")
-          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_ipa_path
-          ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
-        end
-
-        Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path if File.exist?(absolute_dsym_path)
-        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] = Gym::BuildCommandGenerator.archive_path
-        ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path if File.exist?(absolute_dsym_path)
-
-        return absolute_ipa_path
-      end
-
-      def self.description
-        "Easily build and sign your app (via _gym_)"
-      end
-
-      def self.details
-        "More information: https://fastlane.tools/gym"
-      end
-
-      def self.output
-        [
-          ['IPA_OUTPUT_PATH', 'The path to the newly generated ipa file'],
-          ['DSYM_OUTPUT_PATH', 'The path to the dSYM files'],
-          ['XCODEBUILD_ARCHIVE', 'The path to the xcodebuild archive']
-        ]
-      end
+        # Defaulting to ios specific values
+        params[:catalyst_platform] = "ios"
 
-      def self.return_value
-        "The absolute path to the generated ipa file"
+        super(params)
       end
 
-      def self.author
-        "KrauseFx"
-      end
+      #####################################################
+      # @!group Documentation
+      #####################################################
 
       def self.available_options
         require 'gym'
-        Gym::Options.available_options
-      end
-
-      def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
-      end
+        require 'gym/options'
 
-      def self.example_code
-        [
-          'build_ios_app(scheme: "MyApp", workspace: "MyApp.xcworkspace")',
-          'build_ios_app(
-            workspace: "MyApp.xcworkspace",
-            configuration: "Debug",
-            scheme: "MyApp",
-            silent: true,
-            clean: true,
-            output_directory: "path/to/dir", # Destination directory. Defaults to current directory.
-            output_name: "my-app.ipa",       # specify the name of the .ipa file to generate (including file extension)
-            sdk: "iOS 11.1"                  # use SDK as the name or path of the base SDK when building the project.
-          )',
-          'gym         # alias for "build_ios_app"',
-          'build_app   # alias for "build_ios_app"'
-        ]
+        Gym::Options.available_options.reject do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
       end
 
-      def self.category
-        :building
+      def self.is_supported?(platform)
+        [:ios].include?(platform)
       end
 
-      def self.show_xcode_9_warning
-        return unless Helper.xcode_at_least?("9.0")
-        UI.message("You passed a path to a custom plist file for exporting the binary.")
-        UI.message("Make sure to include information about what provisioning profiles to use with Xcode 9")
-        UI.message("More information: https://docs.fastlane.tools/codesigning/xcode-project/#xcode-9-and-up")
+      def self.description
+        "Alias for the `build_app` action but only for iOS"
       end
     end
   end

data/fastlane/lib/fastlane/actions/build_mac_app.rb

@@ -0,0 +1,46 @@
+module Fastlane
+  module Actions
+    require 'fastlane/actions/build_app'
+    class BuildMacAppAction < BuildAppAction
+      # Gym::Options.available_options keys that don't apply to mac apps.
+      REJECT_OPTIONS = [
+        :ipa,
+        :skip_package_ipa,
+        :catalyst_platform
+      ]
+
+      def self.run(params)
+        # Adding reject options back in  so gym has everything it needs
+        params.available_options += Gym::Options.available_options.select do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
+
+        # Defaulting to mac specific values
+        params[:catalyst_platform] = "macos"
+
+        super(params)
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.available_options
+        require 'gym'
+        require 'gym/options'
+
+        Gym::Options.available_options.reject do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
+      end
+
+      def self.is_supported?(platform)
+        [:mac].include?(platform)
+      end
+
+      def self.description
+        "Alias for the `build_app` action but only for macOS"
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/create_pull_request.rb

@@ -43,6 +43,9 @@ module Fastlane
           # Add reviewers to pull request
           add_reviewers(params, number) if params[:reviewers] || params[:team_reviewers]
 
+          # Add a milestone to pull request
+          add_milestone(params, number) if params[:milestone]
+
           Actions.lane_context[SharedValues::CREATE_PULL_REQUEST_HTML_URL] = html_url
           Actions.lane_context[SharedValues::CREATE_PULL_REQUEST_NUMBER] = number
           return html_url
@@ -111,6 +114,27 @@ module Fastlane
         )
       end
 
+      def self.add_milestone(params, number)
+        payload = {}
+        if params[:milestone]
+          payload["milestone"] = params[:milestone]
+        end
+
+        GithubApiAction.run(
+          server_url: params[:api_url],
+          api_token: params[:api_token],
+          http_method: 'PATCH',
+          path: "repos/#{params[:repo]}/issues/#{number}",
+          body: payload,
+          error_handlers: {
+              '*' => proc do |result|
+                UI.error("GitHub responded with #{result[:status]}: #{result[:body]}")
+                return nil
+              end
+          }
+        )
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################
@@ -157,6 +181,11 @@ module Fastlane
                                        description: "The labels for the pull request",
                                        type: Array,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :milestone,
+                                       env_name: "GITHUB_PULL_REQUEST_MILESTONE",
+                                       description: "The milestone ID (Integer) for the pull request",
+                                       type: Numeric,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :head,
                                        env_name: "GITHUB_PULL_REQUEST_HEAD",
                                        description: "The name of the branch where your changes are implemented (defaults to the current branch name)",

data/fastlane/lib/fastlane/actions/docs/{build_ios_app.md → build_app.md}

@@ -146,7 +146,7 @@ export_options({
 Optional: If _gym_ can't automatically detect the provisioning profiles to use, you can pass a mapping of bundle identifiers to provisioning profiles:
 
 ```ruby
-build_ios_app(
+build_app(
   scheme: "Release",
   export_options: {
     method: "app-store",

data/fastlane/lib/fastlane/actions/gym.rb

@@ -1,13 +1,9 @@
 module Fastlane
   module Actions
-    require 'fastlane/actions/build_ios_app'
-    class GymAction < BuildIosAppAction
-      #####################################################
-      # @!group Documentation
-      #####################################################
-
+    require 'fastlane/actions/build_app'
+    class GymAction < BuildAppAction
       def self.description
-        "Alias for the `build_ios_app` action"
+        "Alias for the `build_app` action"
       end
     end
   end

data/fastlane/lib/fastlane/actions/import_from_git.rb

@@ -26,6 +26,10 @@ module Fastlane
                                        description: "The branch or tag to check-out on the repository",
                                        default_value: 'HEAD',
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :dependencies,
+                                      description: "The array of additional Fastfiles in the repository",
+                                      default_value: [],
+                                      optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The path of the Fastfile in the repository",
                                        default_value: 'fastlane/Fastfile',

data/fastlane/lib/fastlane/actions/set_github_release.rb

@@ -241,7 +241,7 @@ module Fastlane
       end
 
       def self.return_type
-        :hash_of_strings
+        :hash
       end
 
       def self.authors

data/fastlane/lib/fastlane/actions/update_plist.rb

@@ -39,7 +39,7 @@ module Fastlane
       end
 
       def self.details
-        "This action allows you to modify any `plist` file."
+        "This action allows you to modify any value inside any `plist` file."
       end
 
       def self.available_options
@@ -57,11 +57,46 @@ module Fastlane
       end
 
       def self.author
-        'rishabhtayal'
+        ["rishabhtayal", "matthiaszarzecki"]
       end
 
       def self.example_code
         [
+          'update_plist( # Updates the CLIENT_ID and GOOGLE_APP_ID string entries in the plist-file
+            plist_path: "path/to/your_plist_file.plist",
+            block: proc do |plist|
+              plist[:CLIENT_ID] = "new_client_id"
+              plist[:GOOGLE_APP_ID] = "new_google_app_id"
+            end
+          )',
+          'update_plist( # Sets a boolean entry
+            plist_path: "path/to/your_plist_file.plist",
+            block: proc do |plist|
+              plist[:boolean_entry] = true
+            end
+          )',
+          'update_plist( # Sets a number entry
+            plist_path: "path/to/your_plist_file.plist",
+            block: proc do |plist|
+              plist[:number_entry] = 13
+            end
+          )',
+          'update_plist( # Sets an array-entry with multiple sub-types
+            plist_path: "path/to/your_plist_file.plist",
+            block: proc do |plist|
+              plist[:array_entry] = ["entry_01", true, 1243]
+            end
+          )',
+          'update_plist( # The block can contain logic too
+            plist_path: "path/to/your_plist_file.plist",
+            block: proc do |plist|
+              if options[:environment] == "production"
+                plist[:CLIENT_ID] = "new_client_id_production"
+              else
+                plist[:CLIENT_ID] = "new_client_id_development"
+              end
+            end
+          )',
           'update_plist( # Advanced processing: find URL scheme for particular key and replace value
             plist_path: "path/to/Info.plist",
             block: proc do |plist|

data/fastlane/lib/fastlane/actions/upload_to_app_store.rb

@@ -11,6 +11,7 @@ module Fastlane
           config.load_configuration_file("Deliverfile")
           config[:screenshots_path] = Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH] if Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH]
           config[:ipa] = Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
+          config[:pkg] = Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
 
           return config if Helper.test?
           Deliver::Runner.new(config).run

data/fastlane/lib/fastlane/fast_file.rb

@@ -263,7 +263,7 @@ module Fastlane
     # @param branch [String] The branch to checkout in the repository
     # @param path [String] The path to the Fastfile
     # @param version [String, Array] Version requirement for repo tags
-    def import_from_git(url: nil, branch: 'HEAD', path: 'fastlane/Fastfile', version: nil)
+    def import_from_git(url: nil, branch: 'HEAD', path: 'fastlane/Fastfile', version: nil, dependencies: [])
       UI.user_error!("Please pass a path to the `import_from_git` action") if url.to_s.length == 0
 
       Actions.execute_action('import_from_git') do
@@ -280,6 +280,10 @@ module Fastlane
 
           branch_option = "--branch #{branch}" if branch != 'HEAD'
 
+          checkout_dependencies = dependencies.map(&:shellescape).join(" ")
+
+          checkout_path = "#{path.shellescape} #{checkout_dependencies}"
+
           UI.message("Cloning remote git repo...")
           Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
             Actions.sh("git clone #{url.shellescape} #{clone_folder.shellescape} --depth 1 -n #{branch_option}")
@@ -292,7 +296,7 @@ module Fastlane
             UI.user_error!("No tag found matching #{version.inspect}") if checkout_param.nil?
           end
 
-          Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{path.shellescape}")
+          Actions.sh("cd #{clone_folder.shellescape} && git checkout #{checkout_param.shellescape} #{checkout_path}")
 
           # We also want to check out all the local actions of this fastlane setup
           containing = path.split(File::SEPARATOR)[0..-2]
@@ -304,7 +308,13 @@ module Fastlane
             # We don't care about a failure here, as local actions are optional
           end
 
-          return_value = import(File.join(clone_folder, path))
+          return_value = nil
+          if dependencies.any?
+            return_value = [import(File.join(clone_folder, path))]
+            return_value += dependencies.map { |file_path| import(File.join(clone_folder, file_path)) }
+          else
+            return_value = import(File.join(clone_folder, path))
+          end
 
           action_completed('import_from_git', status: FastlaneCore::ActionCompletionStatus::SUCCESS)
 

data/fastlane/lib/fastlane/plugins/template/.rubocop.yml

@@ -157,7 +157,9 @@ CrossPlatform/ForkUsage:
   - "**/plugins/template/**/*"
 Lint/IsStringUsage:
   Include:
+  - cert/**/*
   - gym/**/*
+  - match/**/*
   - screengrab/**/*
   - supply/**/*
 Style/MethodCallWithArgsParentheses:

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.140.0'.freeze
+  VERSION = '2.141.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze