fastlane 2.152.0 → 2.153.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -33,4 +33,4 @@ extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.21]
+// FastlaneRunnerAPIVersion [0.9.22]

data/fastlane/swift/Scanfile.swift

@@ -14,4 +14,4 @@ class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.152.0
+// Generated with fastlane 2.153.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -257,4 +257,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.33]
+// FastlaneRunnerAPIVersion [0.9.34]

data/fastlane/swift/Screengrabfile.swift

@@ -14,4 +14,4 @@ class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.152.0
+// Generated with fastlane 2.153.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -93,4 +93,4 @@ extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.23]
+// FastlaneRunnerAPIVersion [0.9.24]

data/fastlane/swift/Snapshotfile.swift

@@ -14,4 +14,4 @@ class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.152.0
+// Generated with fastlane 2.153.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -173,4 +173,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.17]
+// FastlaneRunnerAPIVersion [0.9.18]

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -199,18 +199,32 @@ module FastlaneCore
         self.name
       end
 
+      def boot
+        return unless is_simulator
+        return unless os_type == "iOS"
+
+        UI.message("Booting #{self}")
+        `xcrun simctl boot #{self.udid}` unless self.state == "Booted"
+      end
+
+      def shutdown
+        return unless is_simulator
+        return unless os_type == "iOS"
+
+        UI.message("Shutting down #{self.udid}")
+        `xcrun simctl shutdown #{self.udid}` if self.state == "Booted"
+      end
+
       def reset
         UI.message("Resetting #{self}")
-        `xcrun simctl shutdown #{self.udid}` if self.state == "Booted"
+        shutdown
         `xcrun simctl erase #{self.udid}`
-        return
       end
 
       def delete
         UI.message("Deleting #{self}")
-        `xcrun simctl shutdown #{self.udid}` unless self.state == "Shutdown"
+        shutdown
         `xcrun simctl delete #{self.udid}`
-        return
       end
 
       def disable_slide_to_type
@@ -324,10 +338,10 @@ module FastlaneCore
       def copy_logarchive(device, log_identity, logs_destination_dir)
         require 'shellwords'
 
-        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive").shellescape
+        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive")
         FileUtils.rm_rf(logarchive_dst)
         FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
-        command = "xcrun simctl spawn --standalone #{device.udid} log collect --output #{logarchive_dst} 2>/dev/null"
+        command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst.shellescape} 2>/dev/null"
         FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
       end
     end

data/frameit/lib/frameit/editor.rb

@@ -298,7 +298,7 @@ module Frameit
       resize_text(keyword)
 
       vertical_padding = vertical_frame_padding # assign padding to variable
-      spacing_between_title_and_keyword = (actual_font_size / 2)
+      spacing_between_title_and_keyword = (actual_font_size('keyword') / 2)
       title_left_space = (background.width / 2.0 - title.width / 2.0).round
       keyword_left_space = (background.width / 2.0 - keyword.width / 2.0).round
 
@@ -359,7 +359,7 @@ module Frameit
       vertical_padding = vertical_frame_padding # assign padding to variable
       left_space = (background.width / 2.0 - sum_width / 2.0).round
 
-      self.space_to_device += actual_font_size + vertical_padding
+      self.space_to_device += actual_font_size('title') + vertical_padding
 
       if title_below_image
         title_top = background.height - effective_text_height / 2 - title.height / 2
@@ -385,7 +385,10 @@ module Frameit
       background
     end
 
-    def actual_font_size
+    def actual_font_size(key)
+      font_size = @config[key.to_s]['font_size']
+      return font_size if !font_size.nil? && font_size > 0
+
       font_scale_factor = @config['font_scale_factor'] || 0.1
       UI.user_error!("Parameter 'font_scale_factor' can not be 0. Please provide a value larger than 0.0 (default = 0.1).") if font_scale_factor == 0.0
       [@image.width * font_scale_factor].max.round
@@ -393,7 +396,7 @@ module Frameit
 
     # The space between the keyword and the title
     def keyword_padding
-      (actual_font_size / 3.0).round
+      (actual_font_size('keyword') / 3.0).round
     end
 
     # This will build up to 2 individual images with the title and optional keyword, which will then be added to the real image
@@ -427,7 +430,7 @@ module Frameit
         text_image.combine_options do |i|
           i.font(current_font) if current_font
           i.gravity("Center")
-          i.pointsize(actual_font_size)
+          i.pointsize(actual_font_size(key))
           i.draw("text 0,0 '#{text}'")
           i.interline_spacing(interline_spacing) if interline_spacing
           i.fill(@config[key.to_s]['color'])

data/scan/lib/scan/runner.rb

@@ -39,12 +39,7 @@ module Scan
         end
       end
 
-      # We call this method, to be sure that all other simulators are killed
-      # And a correct one is freshly launched. Switching between multiple simulator
-      # in case the user specified multiple targets works with no issues
-      # This way it's okay to just call it for the first simulator we're using for
-      # the first test run
-      FastlaneCore::Simulator.launch(Scan.devices.first) if Scan.devices && Scan.config[:prelaunch_simulator]
+      prelaunch_simulators
 
       if Scan.config[:reinstall_app]
         app_identifier = Scan.config[:app_identifier]
@@ -165,6 +160,24 @@ module Scan
       File.read(Scan.cache[:temp_junit_report])
     end
 
+    def prelaunch_simulators
+      return unless Scan.devices.to_a.size > 0 # no devices selected, no sims to launch
+
+      # Return early unless the user wants to prelaunch simulators. Or if the user wants simulator logs
+      # then we must prelaunch simulators because Xcode's headless
+      # mode launches and shutsdown the simulators before we can collect the logs.
+      return unless Scan.config[:prelaunch_simulator] || Scan.config[:include_simulator_logs]
+
+      devices_to_shutdown = []
+      Scan.devices.each do |device|
+        devices_to_shutdown << device if device.state == "Shutdown"
+        device.boot
+      end
+      at_exit do
+        devices_to_shutdown.each(&:shutdown)
+      end
+    end
+
     def copy_simulator_logs
       return unless Scan.config[:include_simulator_logs]
 

data/spaceship/lib/spaceship/connect_api.rb

@@ -42,6 +42,7 @@ require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'
+require 'spaceship/connect_api/models/app_store_version_release_request'
 require 'spaceship/connect_api/models/app_store_version_submission'
 require 'spaceship/connect_api/models/app_screenshot_set'
 require 'spaceship/connect_api/models/app_screenshot'

data/spaceship/lib/spaceship/connect_api/client.rb

@@ -88,8 +88,8 @@ module Spaceship
         handle_response(response)
       end
 
-      def post(url_or_path, body)
-        response = with_asc_retry do
+      def post(url_or_path, body, tries: 5)
+        response = with_asc_retry(tries) do
           request(:post) do |req|
             req.url(url_or_path)
             req.body = body.to_json

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -8,6 +8,7 @@ module Spaceship
       end
 
       attr_accessor :id
+      attr_accessor :reverse_attr_map
 
       def initialize(id, attributes)
         self.id = id
@@ -29,6 +30,7 @@ module Spaceship
       # Creates alias for :minOsVersion to :min_os_version
       #
       def attr_mapping(attr_map)
+        self.reverse_attr_map ||= attr_map.invert
         attr_map.each do |key, value|
           # Actual
           reader = value.to_sym
@@ -50,6 +52,14 @@ module Spaceship
         end
       end
 
+      def reverse_attr_mapping(attributes)
+        return nil if attributes.nil?
+        attributes.each_with_object({}) do |(k, v), memo|
+          key = self.class.reverse_attr_map[k] || k
+          memo[key] = v
+        end
+      end
+
       def to_json(*options)
         instance_variables.map do |var|
           [var.to_s[1..-1], instance_variable_get(var)]

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

@@ -106,6 +106,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_age_rating_declaration(age_rating_declaration_id: id, attributes: attributes)
       end
     end

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

@@ -12,9 +12,8 @@ module Spaceship
       attr_accessor :primary_locale
       attr_accessor :removed
       attr_accessor :is_aag
-
+      attr_accessor :available_in_new_territories
       attr_accessor :content_rights_declaration
-
       attr_accessor :app_store_versions
 
       module ContentRightsDeclaration
@@ -29,6 +28,7 @@ module Spaceship
         "primaryLocale" => "primary_locale",
         "removed" => "removed",
         "isAAG" => "is_aag",
+        "availableInNewTerritories" => "available_in_new_territories",
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
@@ -71,6 +71,7 @@ module Spaceship
       end
 
       def update(attributes: nil, app_price_tier_id: nil, territory_ids: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids)
       end
 
@@ -78,6 +79,21 @@ module Spaceship
       # App Info
       #
 
+      def fetch_live_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
+        states = [
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::READY_FOR_SALE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
+        ]
+
+        filter = { app: id }
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        return resp.to_models.select do |model|
+          states.include?(model.app_store_state)
+        end.first
+      end
+
       def fetch_edit_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
@@ -95,6 +111,16 @@ module Spaceship
         end.first
       end
 
+      #
+      # Available Territories
+      #
+
+      def fetch_available_territories(filter: {}, includes: nil, limit: nil, sort: nil)
+        filter ||= {}
+        resps = Spaceship::ConnectAPI.get_available_territories(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
       #
       # App Pricing
       #
@@ -152,6 +178,18 @@ module Spaceship
         end
       end
 
+      def get_latest_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          platform: platform
+        }
+
+        # Get the latest version
+        return get_app_store_versions(filter: filter, includes: includes)
+               .sort_by { |v| Gem::Version.new(v.version_string) }
+               .last
+      end
+
       def get_live_app_store_version(platform: nil, includes: nil)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {

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

@@ -27,6 +27,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_info_localization(app_info_localization_id: id, attributes: attributes)
       end
 

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

@@ -119,6 +119,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes).first
       end
 

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

@@ -1,5 +1,6 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require_relative './app_screenshot_set'
 require 'spaceship/globals'
 
 require 'digest/md5'
@@ -9,6 +10,7 @@ module Spaceship
     class AppScreenshot
       include Spaceship::ConnectAPI::Model
 
+      attr_accessor :file_size
       attr_accessor :file_name
       attr_accessor :source_file_checksum
       attr_accessor :image_asset
@@ -19,6 +21,7 @@ module Spaceship
       attr_accessor :uploaded
 
       attr_mapping({
+        "fileSize" => "file_size",
         "fileName" => "file_name",
         "sourceFileChecksum" => "source_file_checksum",
         "imageAsset" => "image_asset",
@@ -33,6 +36,10 @@ module Spaceship
         return "appScreenshots"
       end
 
+      def awaiting_upload?
+        (asset_delivery_state || {})["state"] == "AWAITING_UPLOAD"
+      end
+
       def complete?
         (asset_delivery_state || {})["state"] == "COMPLETE"
       end
@@ -84,11 +91,43 @@ module Spaceship
           fileName: filename
         }
 
-        # Create placeholder
-        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
-          app_screenshot_set_id: app_screenshot_set_id,
-          attributes: post_attributes
-        ).first
+        # Create placeholder to upload screenshot
+        begin
+          screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+            app_screenshot_set_id: app_screenshot_set_id,
+            attributes: post_attributes
+          ).first
+        rescue => error
+          # Sometimes creating a screenshot with the web session App Store Connect API
+          # will result in a false failure. The response will return a 503 but the database
+          # insert will eventually go through.
+          #
+          # When this is observed, we will poll until we find the matchin screenshot that
+          # is awaiting for upload and file size
+          #
+          # https://github.com/fastlane/fastlane/pull/16842
+          time = Time.now.to_i
+
+          timeout_minutes = (ENV["SPACESHIP_SCREENSHOT_UPLOAD_TIMEOUT"] || 20).to_i
+
+          loop do
+            puts("Waiting for screenshot to appear before uploading...")
+            sleep(30)
+
+            screenshots = Spaceship::ConnectAPI::AppScreenshotSet
+                          .get(app_screenshot_set_id: app_screenshot_set_id)
+                          .app_screenshots
+
+            screenshot = screenshots.find do |s|
+              s.awaiting_upload? && s.file_size == filesize
+            end
+
+            break if screenshot
+
+            time_diff = Time.now.to_i - time
+            raise error if time_diff >= (60 * timeout_minutes)
+          end
+        end
 
         # Upload the file
         upload_operations = screenshot.upload_operations

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

@@ -39,6 +39,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_review_detail(app_store_review_detail_id: id, attributes: attributes)
       end
 

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

@@ -85,6 +85,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_version(app_store_version_id: id, attributes: attributes).first
       end
 
@@ -155,6 +156,15 @@ module Spaceship
         return resp.to_models.first
       end
 
+      #
+      # App Store Version Release Requests
+      #
+
+      def create_app_store_version_release_request
+        resp = Spaceship::ConnectAPI.post_app_store_version_release_request(app_store_version_id: id)
+        return resp.to_models.first
+      end
+
       #
       # Build
       #