fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/plugins/template/spec/spec_helper.rb.erb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 
 require 'simplecov'
 

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

@@ -35,6 +35,10 @@ module Fastlane
     # rubocop:disable Metrics/BlockNesting
     def self.start(user: nil, is_swift_fastfile: false)
       if FastlaneCore::FastlaneFolder.setup? && !Helper.test?
+
+        # If Fastfile.swift exists, but the swift sources folder does not, rebuild it
+        setup_swift_support if is_swift_fastfile
+
         require 'fastlane/lane_list'
         Fastlane::LaneList.output(FastlaneCore::FastlaneFolder.fastfile_path)
         UI.important("------------------")
@@ -127,6 +131,24 @@ module Fastlane
     end
     # rubocop:enable Metrics/BlockNesting
 
+    def self.setup_swift_support
+      runner_source_resources = "#{Fastlane::ROOT}/swift/."
+      destination_path = File.expand_path('swift', FastlaneCore::FastlaneFolder.path)
+
+      # Return eearly if already setup
+      return if File.exist?(destination_path)
+
+      # Show message if Fastfile.swift exists but missing Swift classes and Xcode project
+      if FastlaneCore::FastlaneFolder.swift?
+        UI.important("Restoring Swift classes and FastlaneSwiftRunner.xcodeproj...")
+      end
+
+      FileUtils.cp_r(runner_source_resources, destination_path)
+      UI.success("Copied Swift fastlane runner project to '#{destination_path}'.")
+
+      Fastlane::SwiftLaneManager.first_time_setup
+    end
+
     def initialize(is_swift_fastfile: nil, user: nil, project_path: nil, had_multiple_projects_to_choose_from: nil, preferred_setup_method: nil)
       self.is_swift_fastfile = is_swift_fastfile
       self.user = user
@@ -260,21 +282,12 @@ module Fastlane
 
     def finish_up
       write_fastfile!
-      setup_swift_support if is_swift_fastfile
+      self.class.setup_swift_support if is_swift_fastfile
       show_analytics_note
       explain_concepts
       suggest_next_steps
     end
 
-    def setup_swift_support
-      runner_source_resources = "#{Fastlane::ROOT}/swift/."
-      destination_path = File.expand_path('swift', FastlaneCore::FastlaneFolder.path)
-      FileUtils.cp_r(runner_source_resources, destination_path)
-      UI.success("Copied Swift fastlane runner project to '#{destination_path}'.")
-
-      Fastlane::SwiftLaneManager.first_time_setup
-    end
-
     def fastfile_template_content
       if self.is_swift_fastfile
         path = "#{Fastlane::ROOT}/lib/assets/DefaultFastfileTemplate.swift"

data/fastlane/lib/fastlane/setup/setup_ios.rb

@@ -147,9 +147,9 @@ module Fastlane
                 increment_build_number_if_applicable,
                 "\tbuildApp(#{project_prefix}scheme: \"#{self.scheme}\")"]
         if include_metadata
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\")"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\")"
         else
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\", skipScreenshots: true, skipMetadata: true)"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\", skipScreenshots: true, skipMetadata: true)"
         end
         lane << "}"
       else
@@ -219,7 +219,7 @@ module Fastlane
                 "\tcaptureScreenshots(#{project_prefix}scheme: \"#{ui_testing_scheme}\")"]
 
         if automatic_upload
-          lane << "\tuploadToAppStore(username: \"#{self.user}\", app: \"#{self.app_identifier}\", skipBinaryUpload: true, skipMetadata: true)"
+          lane << "\tuploadToAppStore(username: \"#{self.user}\", appIdentifier: \"#{self.app_identifier}\", skipBinaryUpload: true, skipMetadata: true)"
         end
         lane << "}"
       else

data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb

@@ -79,6 +79,7 @@ module Fastlane
       available_external_actions = Fastlane.external_actions || []
       available_actions = []
       ActionsList.all_actions do |action|
+        next unless action.respond_to?(:action_name)
         available_actions << action.action_name unless available_external_actions.include?(action)
       end
 
@@ -108,6 +109,7 @@ module Fastlane
       # Excludes all actions that aren't pluign actions (including external actions)
       available_actions = []
       ActionsList.all_actions do |action|
+        next unless action.respond_to?(:action_name)
         available_actions << action.action_name unless available_plugins.include?(action)
       end
 
@@ -151,6 +153,7 @@ module Fastlane
 
       tool_details = []
       ActionsList.all_actions do |action|
+        next unless action.respond_to?(:action_name)
         next if self.actions_not_supported.include?(action.action_name)
 
         swift_function = process_action(action: action)

data/fastlane/lib/fastlane/swift_fastlane_function.rb

@@ -29,10 +29,10 @@ module Fastlane
       @sample_return_value = non_empty(string: sample_return_value)
       @param_type_overrides = key_type_overrides
 
-      # rubocop:disable LineLength
+      # rubocop:disable Layout/LineLength
       # class instance?
-      @reserved_words = %w[associativity break case catch class continue convenience default deinit didSet do else enum extension fallthrough false final for func guard if in infix init inout internal lazy let mutating nil operator override precedence private public repeat required return self static struct subscript super switch throws true try var weak where while willSet].to_set
-      # rubocop:enable LineLength
+      @reserved_words = %w[actor associativity async await break case catch class continue convenience default deinit didSet do else enum extension fallthrough false final for func guard if in infix init inout internal lazy let mutating nil operator override precedence private public repeat required return self static struct subscript super switch throws true try var weak where while willSet].to_set
+      # rubocop:enable Layout/LineLength
     end
 
     def sanitize_reserved_word(word: nil)
@@ -97,6 +97,8 @@ module Fastlane
         return "Bool"
       elsif type_override == Float
         return "Float"
+      elsif type_override == String
+        return "String"
       elsif type_override == :string_callback
         # David Hart:
         # It doesn't make sense to add escaping annotations to optional closures because they aren't function types:
@@ -116,6 +118,7 @@ module Fastlane
     end
 
     def get_type(param: nil, default_value: nil, optional: nil, param_type_override: nil, is_string: true)
+      require 'bigdecimal'
       unless param_type_override.nil?
         type = determine_type_from_override(type_override: param_type_override)
       end
@@ -136,7 +139,7 @@ module Fastlane
         type = "[String]"
       elsif default_value.kind_of?(Hash)
         type = "[String : Any]"
-      # Altough we can have a default value of Integer type, if param_type_override overridden that value, respect it.
+      # Although we can have a default value of Integer type, if param_type_override overridden that value, respect it.
       elsif default_value.kind_of?(Integer)
         if type == "Double" || type == "Float"
           begin
@@ -153,6 +156,7 @@ module Fastlane
       return "#{type}#{optional_specifier}"
     end
 
+    # rubocop:disable Metrics/PerceivedComplexity
     def parameters
       unless @param_names
         return ""
@@ -168,6 +172,9 @@ module Fastlane
             default_value = "[:]"
           elsif type != "Bool" && type != "[String]" && type != "Int" && type != "@escaping ((String) -> Void)" && type != "Float" && type != "Double"
             default_value = "\"#{default_value}\""
+          elsif type == "Float" || type == "Double"
+            require 'bigdecimal'
+            default_value = BigDecimal(default_value).to_s
           end
         end
 
@@ -186,7 +193,13 @@ module Fastlane
         if default_value.nil?
           "#{param}: #{type}"
         else
-          "#{param}: #{type} = #{default_value}"
+          if type == "((String) -> Void)?"
+            "#{param}: #{type} = nil"
+          elsif optional && type.end_with?('?') && !type.start_with?('Any') || type.start_with?('Bool')
+            "#{param}: OptionalConfigValue<#{type}> = .fastlaneDefault(#{default_value})"
+          else
+            "#{param}: #{type} = #{default_value}"
+          end
         end
       end
 
@@ -228,7 +241,7 @@ module Fastlane
       # Adds newlines between each documentation element.
       documentation = documentation_elements.flat_map { |element| [element, separator] }.tap(&:pop).join("\n")
 
-      return "/**\n#{documentation}\n*/\n"
+      return "/**\n#{documentation.gsub('/*', '/\\*')}\n*/\n"
     end
 
     def swift_parameter_documentation
@@ -267,12 +280,17 @@ module Fastlane
         return "[]" # return empty list for argument
       end
 
-      argument_object_strings = @param_names.zip(param_type_overrides).map do |name, type_override|
+      argument_object_strings = @param_names.zip(param_type_overrides, param_default_values, param_optionality_values, param_is_strings).map do |name, type_override, default_value, is_optional, is_string|
+        type = get_type(param: name, default_value: default_value, optional: is_optional, param_type_override: type_override, is_string: is_string)
         sanitized_name = camel_case_lower(string: name)
         sanitized_name = sanitize_reserved_word(word: sanitized_name)
-        type_string = type_override == :string_callback ? ", type: .stringClosure" : nil
+        type_string = type_override == :string_callback ? ".stringClosure" : "nil"
 
-        "RubyCommand.Argument(name: \"#{name}\", value: #{sanitized_name}#{type_string})"
+        if !(type_override == :string_callback || !(is_optional && default_value.nil? && !type.start_with?('Any') || type.start_with?('Bool')))
+          { name: "#{sanitized_name.gsub('`', '')}Arg", arg: "let #{sanitized_name.gsub('`', '')}Arg = #{sanitized_name}.asRubyArgument(name: \"#{name}\", type: #{type_string})" }
+        else
+          { name: "#{sanitized_name.gsub('`', '')}Arg", arg: "let #{sanitized_name.gsub('`', '')}Arg = RubyCommand.Argument(name: \"#{name}\", value: #{sanitized_name}, type: #{type_string})" }
+        end
       end
       return argument_object_strings
     end
@@ -303,13 +321,17 @@ module Fastlane
 
     def implementation
       args = build_argument_list
+      implm = "#{args.group_by { |h| h[:arg] }.keys.join("\n")}\n"
+      if args.empty?
+        implm += "let args: [RubyCommand.Argument] = []\n"
+      else
+        implm += "let array: [RubyCommand.Argument?] = [#{args.group_by { |h| h[:name] }.keys.join(",\n")}]\n"
+        implm += "let args: [RubyCommand.Argument] = array\n"
+        implm += ".filter { $0?.value != nil }\n"
+        implm += ".compactMap { $0 }\n"
+      end
+      implm += "let command = RubyCommand(commandID: \"\", methodName: \"#{@function_name}\", className: nil, args: args)\n"
 
-      implm = "  let command = RubyCommand(commandID: \"\", methodName: \"#{@function_name}\", className: nil, args: ["
-      # Get the indent of the first argument in the list to give each
-      # subsequent argument it's own line with proper indenting
-      indent = ' ' * implm.length
-      implm += args.join(",\n#{indent}")
-      implm += "])\n"
       return implm + "  #{return_statement}"
     end
   end
@@ -410,7 +432,13 @@ module Fastlane
         param = sanitize_reserved_word(word: param)
         static_var_for_parameter_name = param
 
-        "#{param}: #{type} = #{self.class_name.downcase}.#{static_var_for_parameter_name}"
+        if type == "((String) -> Void)?"
+          "#{param}: #{type} = nil"
+        elsif (optional && type.end_with?('?') && !type.start_with?('Any')) || type.start_with?('Bool')
+          "#{param}: OptionalConfigValue<#{type}> = .fastlaneDefault(#{self.class_name.downcase}.#{static_var_for_parameter_name})"
+        else
+          "#{param}: #{type} = #{self.class_name.downcase}.#{static_var_for_parameter_name}"
+        end
       end
 
       return param_names_and_types

data/fastlane/lib/fastlane/swift_runner_upgrader.rb

@@ -29,6 +29,8 @@ module Fastlane
       @source_swift_code_file_folder_path = File.expand_path(File.join(Fastlane::ROOT, "/swift"))
       @target_swift_code_file_folder_path = FastlaneCore::FastlaneFolder.swift_folder_path
 
+      Fastlane::Setup.setup_swift_support
+
       manifest_file = File.join(@source_swift_code_file_folder_path, "/upgrade_manifest.json")
       UI.success("loading manifest: #{manifest_file}")
       @manifest_hash = JSON.parse(File.read(manifest_file))

data/fastlane/lib/fastlane/version.rb

@@ -1,6 +1,6 @@
 module Fastlane
-  VERSION = '2.165.1'.freeze
+  VERSION = '2.187.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
+  RUBOCOP_REQUIREMENT = '1.12.1'.freeze
 end

data/fastlane/swift/Actions.swift

@@ -1,5 +1,5 @@
 // Actions.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 // This autogenerated file will be overwritten or replaced when running "fastlane generate_swift"
 //

data/fastlane/swift/Appfile.swift

@@ -1,5 +1,5 @@
 // Appfile.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 var appIdentifier: String { return "" } // The bundle identifier of your app
 var appleID: String { return "" } // Your Apple email address

data/fastlane/swift/ArgumentProcessor.swift

@@ -1,5 +1,5 @@
 // ArgumentProcessor.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/ControlCommand.swift

@@ -1,5 +1,5 @@
 // ControlCommand.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Deliverfile.swift

@@ -1,5 +1,5 @@
 // Deliverfile.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 // This class is automatically included in FastlaneRunner during build
 
@@ -17,4 +17,4 @@ public class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.165.0
+// Generated with fastlane 2.187.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -1,5 +1,5 @@
 // DeliverfileProtocol.swift
-// Copyright (c) 2020 FastlaneTools
+// Copyright (c) 2021 FastlaneTools
 
 public protocol DeliverfileProtocol: class {
     /// Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)
@@ -9,7 +9,7 @@ public protocol DeliverfileProtocol: class {
     var apiKey: [String: Any]? { get }
 
     /// Your Apple ID Username
-    var username: String { get }
+    var username: String? { get }
 
     /// The bundle identifier of your app
     var appIdentifier: String? { get }
@@ -78,7 +78,7 @@ public protocol DeliverfileProtocol: class {
     var resetRatings: Bool { get }
 
     /// The price tier of this application
-    var priceTier: String? { get }
+    var priceTier: Int? { get }
 
     /// Path to the app rating's config
     var appRatingConfigPath: String? { get }
@@ -137,7 +137,7 @@ public protocol DeliverfileProtocol: class {
     /// Metadata: The english name of the secondary second sub category (e.g. `Educational`, `Puzzle`)
     var secondarySecondSubCategory: String? { get }
 
-    /// Metadata: A hash containing the trade representative contact information
+    /// **DEPRECATED!** This is no longer used by App Store Connect - Metadata: A hash containing the trade representative contact information
     var tradeRepresentativeContactInformation: [String: Any]? { get }
 
     /// Metadata: A hash containing the review information
@@ -147,10 +147,10 @@ public protocol DeliverfileProtocol: class {
     var appReviewAttachmentFile: String? { get }
 
     /// Metadata: The localised app description
-    var description: String? { get }
+    var description: [String: Any]? { get }
 
     /// Metadata: The localised app name
-    var name: String? { get }
+    var name: [String: Any]? { get }
 
     /// Metadata: The localised app subtitle
     var subtitle: [String: Any]? { get }
@@ -162,19 +162,19 @@ public protocol DeliverfileProtocol: class {
     var promotionalText: [String: Any]? { get }
 
     /// Metadata: Localised release notes for this version
-    var releaseNotes: String? { get }
+    var releaseNotes: [String: Any]? { get }
 
     /// Metadata: Localised privacy url
-    var privacyUrl: String? { get }
+    var privacyUrl: [String: Any]? { get }
 
     /// Metadata: Localised Apple TV privacy policy text
-    var appleTvPrivacyPolicy: String? { get }
+    var appleTvPrivacyPolicy: [String: Any]? { get }
 
     /// Metadata: Localised support url
-    var supportUrl: String? { get }
+    var supportUrl: [String: Any]? { get }
 
     /// Metadata: Localised marketing url
-    var marketingUrl: String? { get }
+    var marketingUrl: [String: Any]? { get }
 
     /// Metadata: List of languages to activate
     var languages: [String]? { get }
@@ -186,13 +186,13 @@ public protocol DeliverfileProtocol: class {
     var precheckIncludeInAppPurchases: Bool { get }
 
     /// The (spaceship) app ID of the app you want to use/modify
-    var app: String { get }
+    var app: Int? { get }
 }
 
 public extension DeliverfileProtocol {
     var apiKeyPath: String? { return nil }
     var apiKey: [String: Any]? { return nil }
-    var username: String { return "" }
+    var username: String? { return nil }
     var appIdentifier: String? { return nil }
     var appVersion: String? { return nil }
     var ipa: String? { return nil }
@@ -215,7 +215,7 @@ public extension DeliverfileProtocol {
     var autoReleaseDate: Int? { return nil }
     var phasedRelease: Bool { return false }
     var resetRatings: Bool { return false }
-    var priceTier: String? { return nil }
+    var priceTier: Int? { return nil }
     var appRatingConfigPath: String? { return nil }
     var submissionInformation: [String: Any]? { return nil }
     var teamId: String? { return nil }
@@ -238,22 +238,22 @@ public extension DeliverfileProtocol {
     var tradeRepresentativeContactInformation: [String: Any]? { return nil }
     var appReviewInformation: [String: Any]? { return nil }
     var appReviewAttachmentFile: String? { return nil }
-    var description: String? { return nil }
-    var name: String? { return nil }
+    var description: [String: Any]? { return nil }
+    var name: [String: Any]? { return nil }
     var subtitle: [String: Any]? { return nil }
     var keywords: [String: Any]? { return nil }
     var promotionalText: [String: Any]? { return nil }
-    var releaseNotes: String? { return nil }
-    var privacyUrl: String? { return nil }
-    var appleTvPrivacyPolicy: String? { return nil }
-    var supportUrl: String? { return nil }
-    var marketingUrl: String? { return nil }
+    var releaseNotes: [String: Any]? { return nil }
+    var privacyUrl: [String: Any]? { return nil }
+    var appleTvPrivacyPolicy: [String: Any]? { return nil }
+    var supportUrl: [String: Any]? { return nil }
+    var marketingUrl: [String: Any]? { return nil }
     var languages: [String]? { return nil }
     var ignoreLanguageDirectoryValidation: Bool { return false }
     var precheckIncludeInAppPurchases: Bool { return true }
-    var app: String { return "" }
+    var app: Int? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.48]
+// FastlaneRunnerAPIVersion [0.9.75]

data/fastlane/swift/Fastfile.swift

@@ -5,7 +5,7 @@
 
 import Foundation
 
-open class Fastfile: LaneFile { 
+open class Fastfile: LaneFile {
     override public init() {
         super.init()
     }