fastlane 2.169.0 → 2.174.0

data/scan/lib/scan/options.rb

@@ -411,6 +411,11 @@ module Scan
                                      description: "Only post on Slack if the tests fail",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :slack_default_payloads,
+                                     env_name: "SCAN_SLACK_DEFAULT_PAYLOADS",
+                                     description: "Specifies default payloads to include in Slack messages. For more info visit https://docs.fastlane.tools/actions/slack",
+                                     optional: true,
+                                     type: Array),
 
         # misc
         FastlaneCore::ConfigItem.new(key: :destination,
@@ -446,6 +451,16 @@ module Scan
                                     description: "Sets a custom path for Swift Package Manager dependencies",
                                     type: String,
                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :skip_package_dependencies_resolution,
+                                     env_name: "SCAN_SKIP_PACKAGE_DEPENDENCIES_RESOLUTION",
+                                     description: "Skips resolution of Swift Package Manager dependencies",
+                                     type: Boolean,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :disable_package_automatic_updates,
+                                     env_name: "SCAN_DISABLE_PACKAGE_AUTOMATIC_UPDATES",
+                                     description: "Prevents packages from automatically being resolved to versions other than those recorded in the `Package.resolved` file",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :use_system_scm,
                                      env_name: "SCAN_USE_SYSTEM_SCM",
                                      description: "Lets xcodebuild use system's scm configuration",

data/scan/lib/scan/runner.rb

@@ -83,7 +83,12 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
-      return if Scan.config[:disable_xcpretty]
+      if Scan.config[:disable_xcpretty]
+        unless tests_exit_status == 0
+          UI.test_failure!("Test execution failed. Exit status: #{tests_exit_status}")
+        end
+        return
+      end
 
       result = TestResultParser.new.parse_result(test_results)
       SlackPoster.new.run(result)

data/scan/lib/scan/slack_poster.rb

@@ -1,5 +1,6 @@
 require 'fastlane/action'
 require 'fastlane/actions/slack'
+require 'fastlane_core/configuration/configuration'
 
 require_relative 'module'
 
@@ -43,7 +44,7 @@ module Scan
         }
       end
 
-      Fastlane::Actions::SlackAction.run({
+      options = FastlaneCore::Configuration.create(Fastlane::Actions::SlackAction.available_options, {
         message: "#{Scan.config[:app_name] || Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
         channel: channel,
         slack_url: Scan.config[:slack_url].to_s,
@@ -51,10 +52,12 @@ module Scan
         username: username,
         icon_url: icon_url,
         payload: {},
+        default_payloads: Scan.config[:slack_default_payloads],
         attachment_properties: {
           fields: fields
         }
       })
+      Fastlane::Actions::SlackAction.run(options)
     end
   end
 end

data/scan/lib/scan/test_command_generator.rb

@@ -32,13 +32,15 @@ module Scan
 
       options = []
       options += project_path_array unless config[:xctestrun]
-      options << "-scmProvider system" if config[:use_system_scm]
       options << "-sdk '#{config[:sdk]}'" if config[:sdk]
       options << destination # generated in `detect_values`
       options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
       if config[:derived_data_path] && !options.include?("-derivedDataPath #{config[:derived_data_path].shellescape}")
         options << "-derivedDataPath #{config[:derived_data_path].shellescape}"
       end
+      if config[:use_system_scm] && !options.include?("-scmProvider system")
+        options << "-scmProvider system"
+      end
       options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
       if FastlaneCore::Helper.xcode_at_least?(10)
         options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]

data/screengrab/lib/screengrab/runner.rb

@@ -24,6 +24,8 @@ module Screengrab
     end
 
     def run
+      # Standardize the locales
+      @config[:locales].map! { |locale| locale.gsub("_", "-") }
       FastlaneCore::PrintTable.print_values(config: @config, hide_keys: [], title: "Summary for screengrab #{Fastlane::VERSION}")
 
       app_apk_path = @config.fetch(:app_apk_path, ask: false)

data/sigh/lib/sigh/runner.rb

@@ -327,7 +327,7 @@ module Sigh
         UI.important("Found more than one code signing identity. Choosing the first one. Check out `fastlane sigh --help` to see all available options.")
         UI.important("Available Code Signing Identities for current filters:")
         certificates.each do |c|
-          str = ["\t- Name:", c.display_name, "- ID:", c.id + " - Expires", c.expires.strftime("%d/%m/%Y")].join(" ")
+          str = ["\t- Name:", c.display_name, "- ID:", c.id + " - Expires", Time.parse(c.expiration_date).strftime("%Y-%m-%d")].join(" ")
           UI.message(str.green)
         end
       end

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -227,7 +227,7 @@ open class Snapshot: NSObject {
         #if os(OSX)
             let homeDir = URL(fileURLWithPath: NSHomeDirectory())
             return homeDir.appendingPathComponent(cachePath)
-        #elseif arch(i386) || arch(x86_64)
+        #elseif arch(i386) || arch(x86_64) || arch(arm64)
             guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else {
                 throw SnapshotError.cannotFindSimulatorHomeDirectory
             }

data/snapshot/lib/snapshot/options.rb

@@ -123,7 +123,7 @@ module Snapshot
                                      type: Boolean),
         FastlaneCore::ConfigItem.new(key: :override_status_bar,
                                      env_name: 'SNAPSHOT_OVERRIDE_STATUS_BAR',
-                                     description: "Enabling this option wil automatically override the status bar to show 9:41 AM, full battery, and full reception",
+                                     description: "Enabling this option will automatically override the status bar to show 9:41 AM, full battery, and full reception",
                                      default_value: false,
                                      is_string: false),
         FastlaneCore::ConfigItem.new(key: :localize_simulator,
@@ -253,6 +253,16 @@ module Snapshot
                                      description: "Sets a custom path for Swift Package Manager dependencies",
                                      type: String,
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :skip_package_dependencies_resolution,
+                                     env_name: "SNAPSHOT_SKIP_PACKAGE_DEPENDENCIES_RESOLUTION",
+                                     description: "Skips resolution of Swift Package Manager dependencies",
+                                     type: Boolean,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :disable_package_automatic_updates,
+                                     env_name: "SNAPSHOT_DISABLE_PACKAGE_AUTOMATIC_UPDATES",
+                                     description: "Prevents packages from automatically being resolved to versions other than those recorded in the `Package.resolved` file",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :testplan,
                                      env_name: "SNAPSHOT_TESTPLAN",
                                      description: "The testplan associated with the scheme that should be used for testing",
@@ -283,7 +293,12 @@ module Snapshot
                                      env_name: "SNAPSHOT_SUPPRESS_XCODE_OUTPUT",
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      type: Boolean,
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :use_system_scm,
+                                     env_name: "SNAPSHOT_USE_SYSTEM_SCM",
+                                     description: "Lets xcodebuild use system's scm configuration",
+                                     type: Boolean,
+                                     default_value: false)
       ]
     end
   end

data/snapshot/lib/snapshot/update.rb

@@ -8,7 +8,7 @@ module Snapshot
     def self.find_helper
       paths = Dir["./**/SnapshotHelper.swift"] + Dir["./**/SnapshotHelperXcode8.swift"]
       # exclude assets in gym
-      paths.reject { |p| p.include?("snapshot/lib/assets/") }
+      paths.reject { |p| p.include?("snapshot/lib/assets/") || p.include?("DerivedData") }
     end
 
     def update(force: false)

data/spaceship/lib/spaceship/client.rb

@@ -403,6 +403,7 @@ module Spaceship
     # This will also handle 2 step verification and 2 factor authentication
     #
     # It is called in `send_login_request` of sub classes (which the method `login`, above, transferred over to via `do_login`)
+    # rubocop:disable Metrics/PerceivedComplexity
     def send_shared_login_request(user, password)
       # Check if we have a cached/valid session
       #
@@ -506,9 +507,19 @@ module Spaceship
           # User Credentials are wrong
           raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
         elsif response.status == 412 && AUTH_TYPES.include?(response.body["authType"])
+
+          if try_upgrade_2fa_later(response)
+            store_cookie
+            fetch_olympus_session
+            return true
+          end
+
           # Need to acknowledge Apple ID and Privacy statement - https://github.com/fastlane/fastlane/issues/12577
           # Looking for status of 412 might be enough but might be safer to keep looking only at what is being reported
-          raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement."
+          raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. " \
+                                                            "Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement. " \
+                                                            "Your account might also be asked to upgrade to 2FA. " \
+                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automaticaly bypass 2FA upgrade if possible."
         elsif (response['Set-Cookie'] || "").include?("itctx")
           raise "Looks like your Apple ID is not enabled for App Store Connect, make sure to be able to login online"
         else
@@ -517,6 +528,7 @@ module Spaceship
         end
       end
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # Get the `itctx` from the new (22nd May 2017) API endpoint "olympus"
     # Update (29th March 2019) olympus migrates to new appstoreconnect API
@@ -925,3 +937,4 @@ module Spaceship
 end
 
 require 'spaceship/two_step_or_factor_client'
+require 'spaceship/upgrade_2fa_later_client'

data/spaceship/lib/spaceship/connect_api.rb

@@ -35,6 +35,12 @@ require 'spaceship/connect_api/models/custom_app_organization'
 require 'spaceship/connect_api/models/custom_app_user'
 require 'spaceship/connect_api/models/pre_release_version'
 
+require 'spaceship/connect_api/models/app_data_usage'
+require 'spaceship/connect_api/models/app_data_usage_category'
+require 'spaceship/connect_api/models/app_data_usage_data_protection'
+require 'spaceship/connect_api/models/app_data_usage_grouping'
+require 'spaceship/connect_api/models/app_data_usage_purposes'
+require 'spaceship/connect_api/models/app_data_usages_publish_state'
 require 'spaceship/connect_api/models/age_rating_declaration'
 require 'spaceship/connect_api/models/app_category'
 require 'spaceship/connect_api/models/app_info'

data/spaceship/lib/spaceship/connect_api/api_client.rb

@@ -196,7 +196,7 @@ module Spaceship
 
         store_csrf_tokens(response)
 
-        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
+        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, headers: response.headers, client: self)
       end
 
       def handle_401(response)
@@ -247,8 +247,23 @@ module Spaceship
         # ]
         # }
 
+        # Detail is missing in this response making debugging super hard
+        # {"errors" =>
+        #   [
+        #     {
+        #       "id"=>"80ea6cff-0043-4543-9cd1-3e26b0fce383",
+        #       "status"=>"409",
+        #       "code"=>"ENTITY_ERROR.RELATIONSHIP.INVALID",
+        #       "title"=>"The provided entity includes a relationship with an invalid value",
+        #       "source"=>{
+        #         "pointer"=>"/data/relationships/primarySubcategoryOne"
+        #       }
+        #     }
+        #   ]
+        # }
+
         return response.body['errors'].map do |error|
-          messages = [[error['title'], error['detail']].compact.join(" - ")]
+          messages = [[error['title'], error['detail'], error.dig("source", "pointer")].compact.join(" - ")]
 
           meta = error["meta"] || {}
           associated_errors = meta["associatedErrors"] || {}

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -144,6 +144,12 @@ module Spaceship
         end.first
       end
 
+      def fetch_latest_app_info(client: nil, includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_app_infos(app_id: id, includes: includes)
+        return resp.to_models.first
+      end
+
       #
       # Available Territories
       #

data/spaceship/lib/spaceship/connect_api/models/app_data_usage.rb

@@ -0,0 +1,59 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppDataUsage
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :category
+      attr_accessor :grouping
+      attr_accessor :purpose
+      attr_accessor :data_protection
+
+      attr_mapping({
+        "category" => "category",
+        "grouping" => "grouping",
+        "dataProtection" => "data_protection"
+      })
+
+      def self.type
+        return "appDataUsages"
+      end
+
+      #
+      # Helpers
+      #
+
+      def is_not_collected?
+        return false unless data_protection
+        return data_protection.id == "DATA_NOT_COLLECTED"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(app_id:, filter: {}, includes: nil, limit: nil, sort: nil)
+        raise "app_id is required " if app_id.nil?
+
+        resps = Spaceship::ConnectAPI.get_app_data_usages(app_id: app_id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
+      def self.create(app_id:, app_data_usage_category_id: nil, app_data_usage_protection_id: nil, app_data_usage_purpose_id: nil)
+        raise "app_id is required " if app_id.nil?
+
+        resp = Spaceship::ConnectAPI.post_app_data_usage(
+          app_id: app_id,
+          app_data_usage_category_id: app_data_usage_category_id,
+          app_data_usage_protection_id: app_data_usage_protection_id,
+          app_data_usage_purpose_id: app_data_usage_purpose_id
+        )
+        return resp.to_models.first
+      end
+
+      def delete!
+        Spaceship::ConnectAPI.delete_app_data_usage(app_data_usage_id: id)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/app_data_usage_category.rb

@@ -0,0 +1,65 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppDataUsageCategory
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :deleted
+      attr_accessor :grouping
+
+      attr_mapping({
+        "deleted" => "deleted",
+        "grouping" => "grouping"
+      })
+
+      # Found at https://appstoreconnect.apple.com/iris/v1/appDataUsageCategories
+      module ID
+        PAYMENT_INFORMATION = "PAYMENT_INFORMATION"
+        CREDIT_AND_FRAUD = "CREDIT_AND_FRAUD"
+        OTHER_FINANCIAL_INFO = "OTHER_FINANCIAL_INFO"
+        PRECISE_LOCATION = "PRECISE_LOCATION"
+        SENSITIVE_INFO = "SENSITIVE_INFO"
+        PHYSICAL_ADDRESS = "PHYSICAL_ADDRESS"
+        EMAIL_ADDRESS = "EMAIL_ADDRESS"
+        NAME = "NAME"
+        PHONE_NUMBER = "PHONE_NUMBER"
+        OTHER_CONTACT_INFO = "OTHER_CONTACT_INFO"
+        CONTACTS = "CONTACTS"
+        EMAILS_OR_TEXT_MESSAGES = "EMAILS_OR_TEXT_MESSAGES"
+        PHOTOS_OR_VIDEOS = "PHOTOS_OR_VIDEOS"
+        AUDIO = "AUDIO"
+        GAMEPLAY_CONTENT = "GAMEPLAY_CONTENT"
+        CUSTOMER_SUPPORT = "CUSTOMER_SUPPORT"
+        OTHER_USER_CONTENT = "OTHER_USER_CONTENT"
+        BROWSING_HISTORY = "BROWSING_HISTORY"
+        SEARCH_HISTORY = "SEARCH_HISTORY"
+        USER_ID = "USER_ID"
+        DEVICE_ID = "DEVICE_ID"
+        PURCHASE_HISTORY = "PURCHASE_HISTORY"
+        PRODUCT_INTERACTION = "PRODUCT_INTERACTION"
+        ADVERTISING_DATA = "ADVERTISING_DATA"
+        OTHER_USAGE_DATA = "OTHER_USAGE_DATA"
+        CRASH_DATA = "CRASH_DATA"
+        PERFORMANCE_DATA = "PERFORMANCE_DATA"
+        OTHER_DIAGNOSTIC_DATA = "OTHER_DIAGNOSTIC_DATA"
+        OTHER_DATA = "OTHER_DATA"
+        HEALTH = "HEALTH"
+        FITNESS = "FITNESS"
+        COARSE_LOCATION = "COARSE_LOCATION"
+      end
+
+      def self.type
+        return "appDataUsageCategories"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
+        resps = Spaceship::ConnectAPI.get_app_data_usage_categories(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/app_data_usage_data_protection.rb

@@ -0,0 +1,27 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppDataUsageDataProtection
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :deleted
+
+      attr_mapping({
+        "deleted" => "deleted"
+      })
+
+      # Found at https://appstoreconnect.apple.com/iris/v1/appDataUsageDataProtections
+      module ID
+        DATA_USED_TO_TRACK_YOU = "DATA_USED_TO_TRACK_YOU"
+        DATA_LINKED_TO_YOU = "DATA_LINKED_TO_YOU"
+        DATA_NOT_LINKED_TO_YOU = "DATA_NOT_LINKED_TO_YOU"
+
+        DATA_NOT_COLLECTED = "DATA_NOT_COLLECTED"
+      end
+
+      def self.type
+        return "appDataUsageDataProtections"
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/app_data_usage_grouping.rb

@@ -0,0 +1,18 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppDataUsageGrouping
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :deleted
+
+      attr_mapping({
+        "deleted" => "deleted"
+      })
+
+      def self.type
+        return "appDataUsageGroupings"
+      end
+    end
+  end
+end