fastlane 2.128.1 → 2.133.0

data/fastlane/lib/fastlane/actions/pod_push.rb

@@ -47,6 +47,10 @@ module Fastlane
           command << "--verbose"
         end
 
+        if params[:use_modular_headers]
+          command << "--use-modular-headers"
+        end
+
         result = Actions.sh(command.join(' '))
         UI.success("Successfully pushed Podspec ⬆️ ")
         return result
@@ -65,25 +69,30 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :use_bundle_exec,
                                          description: "Use bundle exec when there is a Gemfile presented",
                                          type: Boolean,
-                                         default_value: false),
+                                         default_value: false,
+                                         env_name: "FL_POD_PUSH_USE_BUNDLE_EXEC"),
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The Podspec you want to push",
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
                                          UI.user_error!("File must be a `.podspec` or `.podspec.json`") unless value.end_with?(".podspec", ".podspec.json")
-                                       end),
+                                       end,
+                                       env_name: "FL_POD_PUSH_PATH"),
           FastlaneCore::ConfigItem.new(key: :repo,
                                        description: "The repo you want to push. Pushes to Trunk by default",
-                                       optional: true),
+                                       optional: true,
+                                       env_name: "FL_POD_PUSH_REPO"),
           FastlaneCore::ConfigItem.new(key: :allow_warnings,
                                        description: "Allow warnings during pod push",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_ALLOW_WARNINGS"),
           FastlaneCore::ConfigItem.new(key: :use_libraries,
                                        description: "Allow lint to use static libraries to install the spec",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_USE_LIBRARIES"),
           FastlaneCore::ConfigItem.new(key: :sources,
                                        description: "The sources of repos you want the pod spec to lint with, separated by commas",
                                        optional: true,
@@ -91,24 +100,34 @@ module Fastlane
                                        type: Array,
                                        verify_block: proc do |value|
                                          UI.user_error!("Sources must be an array.") unless value.kind_of?(Array)
-                                       end),
+                                       end,
+                                       env_name: "FL_POD_PUSH_SOURCES"),
           FastlaneCore::ConfigItem.new(key: :swift_version,
                                        description: "The SWIFT_VERSION that should be used to lint the spec. This takes precedence over a .swift-version file",
                                        optional: true,
-                                       is_string: true),
+                                       is_string: true,
+                                       env_name: "FL_POD_PUSH_SWIFT_VERSION"),
           FastlaneCore::ConfigItem.new(key: :skip_import_validation,
                                        description: "Lint skips validating that the pod can be imported",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_SKIP_IMPORT_VALIDATION"),
           FastlaneCore::ConfigItem.new(key: :skip_tests,
                                        description: "Lint skips building and running tests during validation",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_SKIP_TESTS"),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        description: "Show more debugging information",
                                        optional: true,
                                        type: Boolean,
-                                       default_value: false)
+                                       default_value: false,
+                                       env_name: "FL_POD_PUSH_VERBOSE"),
+          FastlaneCore::ConfigItem.new(key: :use_modular_headers,
+                                       description: "Use modular headers option during validation",
+                                       optional: true,
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_USE_MODULAR_HEADERS")
         ]
       end
 

data/fastlane/lib/fastlane/actions/puts.rb

@@ -9,7 +9,7 @@ module Fastlane
           return
         end
 
-        # no paramter included in the call means treat this like a normal fastlane ruby call
+        # no parameter included in the call means treat this like a normal fastlane ruby call
         UI.message(params.join(' '))
       end
 

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -7,41 +7,53 @@ module Fastlane
         [:ios, :mac].include?(platform)
       end
 
+      def self.file_column_headers
+        ['Device ID', 'Device Name', 'Device Platform']
+      end
+
       def self.run(params)
-        require 'spaceship'
+        if params[:devices]
+          new_devices = params[:devices].map do |name, udid|
+            [udid, name]
+          end
+        elsif params[:devices_file]
+          require 'csv'
 
-        devices = params[:devices]
-        devices_file = params[:devices_file]
+          devices_file = CSV.read(File.expand_path(File.join(params[:devices_file])), col_sep: "\t")
+          unless devices_file.first == file_column_headers.first(2) || devices_file.first == file_column_headers
+            UI.user_error!("Please provide a file according to the Apple Sample UDID file (https://developer.apple.com/account/resources/downloads/Multiple-Upload-Samples.zip)")
+          end
 
-        mac = params[:platform] == "mac"
+          new_devices = devices_file.drop(1).map do |row|
+            UI.user_error!("Invalid device line, please provide a file according to the Apple Sample UDID file (https://developer.apple.com/account/resources/downloads/Multiple-Upload-Samples.zip)") unless (2..3).cover?(row.count)
+            row
+          end
+        else
+          UI.user_error!("You must pass either a valid `devices` or `devices_file`. Please check the readme.")
+        end
 
+        require 'spaceship'
         credentials = CredentialsManager::AccountManager.new(user: params[:username])
         Spaceship.login(credentials.user, credentials.password)
         Spaceship.select_team
 
         UI.message("Fetching list of currently registered devices...")
-        existing_devices = Spaceship::Device.all(mac: mac)
-
-        if devices
-          device_objs = devices.map do |k, v|
-            next if existing_devices.map(&:udid).include?(v)
-            try_create_device(name: k, udid: v, mac: mac)
-          end
-        elsif devices_file
-          require 'csv'
+        all_platforms = Set[params[:platform]]
+        new_devices.each do |device|
+          next if device[2].nil?
+          all_platforms.add(device[2])
+        end
+        supported_platforms = all_platforms.select { |platform| self.is_supported?(platform.to_sym) }
 
-          devices_file = CSV.read(File.expand_path(File.join(devices_file)), col_sep: "\t")
-          UI.user_error!("Please provide a file according to the Apple Sample UDID file (https://devimages.apple.com.edgekey.net/downloads/devices/Multiple-Upload-Samples.zip)") unless devices_file.first == ['Device ID', 'Device Name']
+        existing_devices = supported_platforms.flat_map { |platform| Spaceship::Device.all(mac: platform == "mac") }
 
-          device_objs = devices_file.drop(1).map do |device|
-            next if existing_devices.map(&:udid).include?(device[0])
+        device_objs = new_devices.map do |device|
+          next if existing_devices.map(&:udid).include?(device[0])
 
-            UI.user_error!("Invalid device line, please provide a file according to the Apple Sample UDID file (http://devimages.apple.com/downloads/devices/Multiple-Upload-Samples.zip)") unless device.count == 2
+          device_platform_supported = !device[2].nil? && self.is_supported?(device[2].to_sym)
+          mac = (device_platform_supported ? device[2] : params[:platform]) == "mac"
 
-            try_create_device(name: device[1], udid: device[0], mac: mac)
-          end
-        else
-          UI.user_error!("You must pass either a valid `devices` or `devices_file`. Please check the readme.")
+          try_create_device(name: device[1], udid: device[0], mac: mac)
         end
 
         UI.success("Successfully registered new devices.")
@@ -55,6 +67,10 @@ module Fastlane
         UI.crash!("Failed to register new device (name: #{name}, UDID: #{udid})")
       end
 
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
       def self.description
         "Registers new devices to the Apple Dev Portal"
       end

data/fastlane/lib/fastlane/actions/resign.rb

@@ -26,7 +26,7 @@ module Fastlane
           )',
           '# You may provide multiple provisioning profiles if the application contains nested
           # applications or app extensions, which need their own provisioning profile.
-          # You can do so by passing an array of provisiong profile strings or a hash
+          # You can do so by passing an array of provisioning profile strings or a hash
           # that associates provisioning profile values to bundle identifier keys.
           resign(
             ipa: "path/to/ipa", # can omit if using the `ipa` action
@@ -75,7 +75,7 @@ module Fastlane
                                                  else [value]
                                                  end
                                          files.each do |file|
-                                           UI.user_error!("Couldn't find provisiong profile at path '#{file}'") unless File.exist?(file)
+                                           UI.user_error!("Couldn't find provisioning profile at path '#{file}'") unless File.exist?(file)
                                          end
                                        end),
           FastlaneCore::ConfigItem.new(key: :version,

data/fastlane/lib/fastlane/actions/slather.rb

@@ -263,6 +263,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :binary_file,
                                        env_name: "FL_SLATHER_BINARY_FILE",
                                        description: "Binary file name to be used for code coverage",
+                                       type: Array,
                                        skip_type_validation: true, # skipping validation for backwards compatibility with Boolean type
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :arch,

data/fastlane/lib/fastlane/actions/sonar.rb

@@ -21,6 +21,9 @@ module Fastlane
         sonar_scanner_args << "-Dsonar.login=\"#{params[:sonar_login]}\"" if params[:sonar_login]
         sonar_scanner_args << "-Dsonar.host.url=\"#{params[:sonar_url]}\"" if params[:sonar_url]
         sonar_scanner_args << "-Dsonar.branch.name=\"#{params[:branch_name]}\"" if params[:branch_name]
+        sonar_scanner_args << "-Dsonar.pullrequest.branch=\"#{params[:pull_request_branch]}\"" if params[:pull_request_branch]
+        sonar_scanner_args << "-Dsonar.pullrequest.base=\"#{params[:pull_request_base]}\"" if params[:pull_request_base]
+        sonar_scanner_args << "-Dsonar.pullrequest.key=\"#{params[:pull_request_key]}\"" if params[:pull_request_key]
         sonar_scanner_args << params[:sonar_runner_args] if params[:sonar_runner_args]
 
         command = [
@@ -103,6 +106,21 @@ module Fastlane
                                        env_name: "FL_SONAR_RUNNER_BRANCH_NAME",
                                        description: "Pass the branch name which is getting scanned",
                                        optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_branch,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_BRANCH",
+                                       description: "The name of the branch that contains the changes to be merged",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_base,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_BASE",
+                                       description: "The long-lived branch into which the PR will be merged",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_key,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_KEY",
+                                       description: "Unique identifier of your PR. Must correspond to the key of the PR in GitHub or TFS",
+                                       optional: true,
                                        is_string: true)
         ]
       end

data/fastlane/lib/fastlane/actions/update_fastlane.rb

@@ -31,7 +31,7 @@ module Fastlane
           UI.important("It seems that your Gem directory is not writable by your current user.")
           UI.important("fastlane would need sudo rights to update itself, however, running 'sudo fastlane' is not recommended.")
           UI.important("If you still want to use this action, please read the documentation on how to set this up:")
-          UI.important("https://docs.fastlane.tools/actions/#update_fastlane")
+          UI.important("https://docs.fastlane.tools/actions/update_fastlane/")
           return
         end
 

data/fastlane/lib/fastlane/commands_generator.rb

@@ -43,7 +43,7 @@ module Fastlane
       Fastlane::PluginUpdateManager.show_update_status
       if FastlaneCore::Globals.capture_output?
         if $stdout.respond_to?(:string)
-          # Sometimes you can get NoMethodError: undefined method `string' for #<IO:<STDOUT>> when runing with FastlaneRunner (swift)
+          # Sometimes you can get NoMethodError: undefined method `string' for #<IO:<STDOUT>> when running with FastlaneRunner (swift)
           FastlaneCore::Globals.captured_output = Helper.strip_ansi_colors($stdout.string)
         end
         $stdout = STDOUT
@@ -329,6 +329,22 @@ module Fastlane
         end
       end
 
+      #####################################################
+      # @!group Swift
+      #####################################################
+
+      if FastlaneCore::FastlaneFolder.swift?
+        command :generate_swift do |c|
+          c.syntax = 'fastlane generate_swift'
+          c.description = 'Generates additional Swift APIs for plugins and local actions'
+
+          c.action do |args, options|
+            SwiftActionsAPIGenerator.new(target_output_path: FastlaneCore::FastlaneFolder.swift_folder_path).generate_swift
+            SwiftPluginsAPIGenerator.new(target_output_path: FastlaneCore::FastlaneFolder.swift_folder_path).generate_swift
+          end
+        end
+      end
+
       default_command(:trigger)
       run!
     end

data/fastlane/lib/fastlane/fast_file.rb

@@ -26,10 +26,15 @@ module Fastlane
                 'you should turn off smart quotes in your editor of choice.')
       end
 
-      content.scan(/^\s*require (.*)/).each do |current|
+      content.scan(/^\s*require ["'](.*?)["']/).each do |current|
         gem_name = current.last
         next if gem_name.include?(".") # these are local gems
-        UI.important("You have required a gem, if this is a third party gem, please use `fastlane_require #{gem_name}` to ensure the gem is installed locally.")
+
+        begin
+          require(gem_name)
+        rescue LoadError
+          UI.important("You have required a gem, if this is a third party gem, please use `fastlane_require '#{gem_name}'` to ensure the gem is installed locally.")
+        end
       end
 
       parse(content, @path)

data/fastlane/lib/fastlane/helper/adb_helper.rb

@@ -31,6 +31,11 @@ module Fastlane
       end
 
       def device_avalaible?(serial)
+        UI.deprecated("Please use `device_available?` instead... This will be removed in a future version of fastlane")
+        device_available?(serial)
+      end
+
+      def device_available?(serial)
         load_all_devices
         return devices.map(&:serial).include?(serial)
       end

data/fastlane/lib/fastlane/helper/crashlytics_helper.rb

@@ -7,7 +7,7 @@ module Fastlane
         def discover_crashlytics_path(params)
           path = params[:crashlytics_path]
 
-          # Finding submit binary inside of given Crashlytics path (for backwards compatability)
+          # Finding submit binary inside of given Crashlytics path (for backwards compatibility)
           if path
             if File.basename(path) != "submit"
               path = Dir[File.join(path, '**', 'submit')].last
@@ -86,7 +86,6 @@ module Fastlane
           containing = File.join(File.expand_path("~/Library"), "CrashlyticsAndroid")
           zip_path = File.join(containing, "crashlytics-devtools.zip")
           jar_path = File.join(containing, "crashlytics-devtools.jar")
-          return jar_path if File.exist?(jar_path)
 
           url = "https://ssl-download-crashlytics-com.s3.amazonaws.com/android/ant/crashlytics.zip"
           require 'net/http'
@@ -94,19 +93,26 @@ module Fastlane
           FileUtils.mkdir_p(containing)
 
           begin
-            UI.important("Downloading Crashlytics Support Library - this might take a minute...")
-
             # Work around ruby defect, where HTTP#get_response and HTTP#post_form don't use ENV proxy settings
             # https://bugs.ruby-lang.org/issues/12724
             uri = URI(url)
             http_conn = Net::HTTP.new(uri.host, uri.port)
             http_conn.use_ssl = true
+            result = http_conn.request_head(uri.path)
+
+            # ETag is returned with quotes, which net/http does not handle. Clean that up
+            etag = result['ETag'] && result['ETag'].tr('"', '')
+
+            # This is a no-op if the current version on disk matches the file on S3
+            return jar_path if File.exist?(zip_path) && etag == Digest::MD5.file(zip_path).hexdigest
+
+            UI.important("Downloading Crashlytics Support Library - this might take a minute...")
             result = http_conn.request_get(uri.path)
-            UI.error!("#{result.message} (#{result.code})") unless result.kind_of?(Net::HTTPSuccess)
+            UI.error("#{result.message} (#{result.code})") unless result.kind_of?(Net::HTTPSuccess)
             File.write(zip_path, result.body)
 
             # Now unzip the file
-            Action.sh("unzip '#{zip_path}' -d '#{containing}'")
+            Action.sh("unzip -o '#{zip_path}' -d '#{containing}'")
 
             UI.user_error!("Couldn't find 'crashlytics-devtools.jar'") unless File.exist?(jar_path)
 

data/fastlane/lib/fastlane/plugins/plugin_manager.rb

@@ -178,6 +178,7 @@ module Fastlane
       with_clean_bundler_env do
         cmd = "bundle install"
         cmd << " --quiet" unless FastlaneCore::Globals.verbose?
+        cmd << " && bundle exec fastlane generate_swift" if FastlaneCore::FastlaneFolder.swift?
         cmd << " && echo 'Successfully installed plugins'"
         UI.command(cmd) if FastlaneCore::Globals.verbose?
         exec(cmd)
@@ -197,6 +198,7 @@ module Fastlane
         cmd = "bundle update"
         cmd << " #{plugins.join(' ')}"
         cmd << " --quiet" unless FastlaneCore::Globals.verbose?
+        cmd << " && bundle exec fastlane generate_swift" if FastlaneCore::FastlaneFolder.swift?
         cmd << " && echo 'Successfully updated plugins'"
         UI.command(cmd) if FastlaneCore::Globals.verbose?
         exec(cmd)

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

@@ -155,6 +155,9 @@ Style/CollectionMethods:
 CrossPlatform/ForkUsage:
   Exclude:
   - "**/plugins/template/**/*"
+Lint/IsStringUsage:
+  Include:
+  - gym/**/*
 Style/MethodCallWithArgsParentheses:
   Enabled: true
   IgnoredMethods:

data/fastlane/lib/fastlane/setup/setup_android.rb

@@ -55,7 +55,7 @@ module Fastlane
 
       self.package_name = UI.input("Package Name (com.krausefx.app): ")
       puts("")
-      puts("To automatically upload builds and metadata to Google Play, fastlane needs a service action json secret file".yellow)
+      puts("To automatically upload builds and metadata to Google Play, fastlane needs a service account json secret file".yellow)
       puts("Follow the Setup Guide on how to get the Json file: https://docs.fastlane.tools/actions/supply/".yellow)
       puts("Feel free to press Enter at any time in order to skip providing pieces of information when asked")
       self.json_key_file = UI.input("Path to the json secret file: ")

data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb

@@ -13,28 +13,18 @@ module Fastlane
     end
   end
 
-  class SwiftFastlaneAPIGenerator
-    DEFAULT_API_VERSION_STRING = "0.9.1"
-    attr_accessor :tools_option_files
-    attr_accessor :actions_not_supported
-    attr_accessor :action_options_to_ignore
-    attr_accessor :target_output_path
-    attr_accessor :generated_paths # stores all file names of generated files (as they are generated)
+  class SwiftAPIGenerator
+  end
 
+  class SwiftFastlaneAPIGenerator < SwiftAPIGenerator
     def initialize(target_output_path: "swift")
+      @target_filename = "Fastlane.swift"
       @target_output_path = File.expand_path(target_output_path)
       @generated_paths = []
-      require 'fastlane'
-      require 'fastlane/documentation/actions_list'
-      Fastlane.load_actions
-      # Tools that can be used with <Toolname>file, like Deliverfile, Screengrabfile
-      # this is important because we need to generate the proper api for these by creating a protocol
-      # with default implementation we can use in the Fastlane.swift API if people want to use
-      # <Toolname>file.swift files.
-      self.tools_option_files = TOOL_CONFIG_FILES.map { |config_file| config_file.downcase.chomp("file") }.to_set
 
-      self.actions_not_supported = ["import", "import_from_git"].to_set
+      super()
 
+      self.actions_not_supported = ["import", "import_from_git"].to_set
       self.action_options_to_ignore = {
 
         "precheck" => [
@@ -51,6 +41,109 @@ module Fastlane
       }
     end
 
+    def extend_content(file_content, tool_details)
+      file_content << "" # newline because we're adding an extension
+      file_content << "// These are all the parsing functions needed to transform our data into the expected types"
+      file_content << generate_lanefile_parsing_functions
+
+      tool_objects = generate_lanefile_tool_objects(classes: tool_details.map(&:swift_class))
+      file_content << tool_objects
+
+      old_file_content = File.read(fastlane_swift_api_path)
+      new_file_content = file_content.join("\n")
+
+      # compare old file content to potential new file content
+      api_version = determine_api_version(new_file_content: new_file_content, old_file_content: old_file_content)
+      old_api_version = find_api_version_string(content: old_file_content)
+
+      # if there is a change, we need to write out the new file
+      if api_version != old_api_version
+        file_content << autogen_version_warning_text(api_version: api_version)
+      else
+        file_content = nil
+      end
+
+      return file_content
+    end
+  end
+
+  class SwiftActionsAPIGenerator < SwiftAPIGenerator
+    def initialize(target_output_path: "swift")
+      @target_filename = "Actions.swift"
+      @target_output_path = File.expand_path(target_output_path)
+      @generated_paths = []
+
+      super()
+
+      # Excludes all actions that aren't external actions (including plugins)
+      available_external_actions = Fastlane.external_actions || []
+      available_actions = []
+      ActionsList.all_actions do |action|
+        available_actions << action.action_name unless available_external_actions.include?(action)
+      end
+
+      self.actions_not_supported = (["import", "import_from_git"] + available_actions).to_set
+      self.action_options_to_ignore = {}
+    end
+  end
+
+  class SwiftPluginsAPIGenerator < SwiftAPIGenerator
+    def initialize(target_output_path: "swift")
+      @target_filename = "Plugins.swift"
+      @target_output_path = File.expand_path(target_output_path)
+      @generated_paths = []
+
+      super()
+
+      # Gets list of plugin actions
+      plugin_actions = Fastlane.plugin_manager.plugin_references.values.flat_map do |info|
+        info[:actions]
+      end
+
+      # Action references from plugins
+      available_plugins = plugin_actions.map do |plugin_action|
+        Fastlane::Runner.new.class_reference_from_action_name(plugin_action)
+      end
+
+      # Excludes all actions that aren't pluign actions (including external actions)
+      available_actions = []
+      ActionsList.all_actions do |action|
+        available_actions << action.action_name unless available_plugins.include?(action)
+      end
+
+      self.actions_not_supported = (["import", "import_from_git"] + available_actions).to_set
+      self.action_options_to_ignore = {}
+    end
+  end
+
+  class SwiftAPIGenerator
+    DEFAULT_API_VERSION_STRING = "0.9.1"
+    attr_accessor :tools_option_files
+    attr_accessor :actions_not_supported
+    attr_accessor :action_options_to_ignore
+    attr_accessor :target_output_path
+    attr_accessor :target_filename
+    attr_accessor :generated_paths # stores all file names of generated files (as they are generated)
+
+    attr_accessor :fastlane_swift_api_path
+
+    def initialize
+      require 'fastlane'
+      require 'fastlane/documentation/actions_list'
+      Fastlane.load_actions
+      # Tools that can be used with <Toolname>file, like Deliverfile, Screengrabfile
+      # this is important because we need to generate the proper api for these by creating a protocol
+      # with default implementation we can use in the Fastlane.swift API if people want to use
+      # <Toolname>file.swift files.
+      self.tools_option_files = TOOL_CONFIG_FILES.map { |config_file| config_file.downcase.chomp("file") }.to_set
+
+      @fastlane_swift_api_path = File.join(@target_output_path, @target_filename)
+    end
+
+    def extend_content(content, tool_details)
+      return content
+    end
+
     def generate_swift
       self.generated_paths = [] # reset generated paths in case we're called multiple times
       file_content = []
@@ -74,24 +167,11 @@ module Fastlane
 
         file_content << swift_function.swift_code
       end
-      file_content << "" # newline because we're adding an extension
-      file_content << "// These are all the parsing functions needed to transform our data into the expected types"
-      file_content << generate_lanefile_parsing_functions
-
-      tool_objects = generate_lanefile_tool_objects(classes: tool_details.map(&:swift_class))
-      file_content << tool_objects
-      new_file_content = file_content.join("\n")
-
-      fastlane_swift_api_path = File.join(@target_output_path, "Fastlane.swift")
-      old_file_content = File.read(fastlane_swift_api_path)
 
-      # compare old file content to potential new file content
-      api_version = determine_api_version(new_file_content: new_file_content, old_file_content: old_file_content)
-      old_api_version = find_api_version_string(content: old_file_content)
+      file_content = extend_content(file_content, tool_details)
 
-      # if there is a change, we need to write out the new file
-      if api_version != old_api_version
-        new_file_content.concat(autogen_version_warning_text(api_version: api_version))
+      if file_content
+        new_file_content = file_content.join("\n")
 
         File.write(fastlane_swift_api_path, new_file_content)
         UI.success(fastlane_swift_api_path)
@@ -337,6 +417,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
       key_default_values = []
       key_optionality_values = []
       key_type_overrides = []
+      key_is_strings = []
 
       if options.kind_of?(Array)
         options.each do |current|
@@ -350,6 +431,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
           key_default_values << current.code_gen_default_value
           key_optionality_values << current.optional
           key_type_overrides << current.data_type
+          key_is_strings << current.is_string
         end
       end
       action_return_type = action.return_type
@@ -357,12 +439,17 @@ func parseInt(fromString: String, function: String = #function) -> Int {
       if self.tools_option_files.include?(action_name.to_s.downcase)
         tool_swift_function = ToolSwiftFunction.new(
           action_name: action_name,
+          action_description: action.description,
+          action_details: action.details,
           keys: keys,
           key_descriptions: key_descriptions,
           key_default_values: key_default_values,
           key_optionality_values: key_optionality_values,
           key_type_overrides: key_type_overrides,
-          return_type: action_return_type
+          key_is_strings: key_is_strings,
+          return_type: action_return_type,
+          return_value: action.return_value,
+          sample_return_value: action.sample_return_value
         )
         generated_protocol_file_path = generate_tool_protocol(tool_swift_function: tool_swift_function)
         self.generated_paths << generated_protocol_file_path unless generated_protocol_file_path.nil?
@@ -370,12 +457,17 @@ func parseInt(fromString: String, function: String = #function) -> Int {
       else
         return SwiftFunction.new(
           action_name: action_name,
+          action_description: action.description,
+          action_details: action.details,
           keys: keys,
           key_descriptions: key_descriptions,
           key_default_values: key_default_values,
           key_optionality_values: key_optionality_values,
           key_type_overrides: key_type_overrides,
-          return_type: action_return_type
+          key_is_strings: key_is_strings,
+          return_type: action_return_type,
+          return_value: action.return_value,
+          sample_return_value: action.sample_return_value
         )
       end
     end