fastlane 2.102.0 → 2.103.0

data/snapshot/lib/snapshot/reports_generator.rb

@@ -78,16 +78,21 @@ module Snapshot
         'iPhone 6 Plus' => "iPhone 6 Plus (5.5-Inch)",
         'iPhone 6s' => "iPhone 6s (4.7-Inch)",
         'iPhone 6' => "iPhone 6 (4.7-Inch)",
-        'iPhone 5s' => "iPhone 5 (4-Inch)",
+        'iPhone 5s' => "iPhone 5s (4-Inch)",
+        'iPhone 5' => "iPhone 5 (4-Inch)",
         'iPhone SE' => "iPhone SE",
-        'iPhone 4s' => "iPhone 4 (3.5-Inch)",
-        'iPad Air' => 'iPad Air',
+        'iPhone 4s' => "iPhone 4s (3.5-Inch)",
+        'iPad 2' => 'iPad 2',
         'iPad Air 2' => 'iPad Air 2',
+        'iPad Air' => 'iPad Air',
         'iPad (5th generation)' => 'iPad (5th generation)',
         'iPad Pro (9.7-inch)' => 'iPad Pro (9.7-inch)',
+        'iPad Pro (9.7 inch)' => 'iPad Pro (9.7-inch)', # iOS 10.3.1 simulator
         'iPad Pro (10.5-inch)' => 'iPad Pro (10.5-inch)',
         'iPad Pro (12.9-inch) (2nd generation)' => 'iPad Pro (12.9-inch) (2nd generation)',
         'iPad Pro (12.9-inch)' => 'iPad Pro (12.9-inch)',
+        'iPad Pro (12.9 inch)' => 'iPad Pro (12.9-inch)', # iOS 10.3.1 simulator
+        'iPad Pro' => 'iPad Pro (12.9-inch)', # iOS 9.3 simulator
         'Apple TV 1080p' => 'Apple TV',
         'Apple TV 4K (at 1080p)' => 'Apple TV 4K (at 1080p)',
         'Apple TV 4K' => 'Apple TV 4K',

data/snapshot/lib/snapshot/runner.rb

@@ -122,6 +122,15 @@ module Snapshot
       UI.verbose("Checking that helper files contain #{current_version}")
 
       helper_files = Update.find_helper
+      if helper_files.empty?
+        UI.error("Your Snapshot Helper file is missing, please place a copy")
+        UI.error("in your project directory")
+        UI.message("More information about Snapshot setup can be found here:")
+        UI.message("https://docs.fastlane.tools/actions/snapshot/#quick-start")
+        UI.user_error!("Please add a Snapshot Helper file to your project")
+        return
+      end
+
       helper_files.each do |path|
         content = File.read(path)
 

data/spaceship/README.md

@@ -177,12 +177,12 @@ Overview of the used API endpoints
   - Repair provisioning profiles
   - Download provisioning profiles
   - Team selection
-- `https://itunesconnect.apple.com`:
+- `https://appstoreconnect.apple.com`:
   - Managing apps
   - Managing beta testers
   - Submitting updates to review
   - Managing app metadata
-- `https://du-itc.itunesconnect.apple.com`:
+- `https://du-itc.appstoreconnect.apple.com`:
   - Upload icons, screenshots, trailers ...
 
 _spaceship_ uses all those API points to offer this seamless experience.

data/spaceship/lib/spaceship/client.rb

@@ -50,6 +50,7 @@ module Spaceship
     UnexpectedResponse = Spaceship::UnexpectedResponse
     AppleTimeoutError = Spaceship::AppleTimeoutError
     UnauthorizedAccessError = Spaceship::UnauthorizedAccessError
+    GatewayTimeoutError = Spaceship::GatewayTimeoutError
     InternalServerError = Spaceship::InternalServerError
 
     # Authenticates with Apple's web services. This method has to be called once
@@ -469,7 +470,7 @@ module Spaceship
         elsif response.status == 412 && AUTH_TYPES.include?(response.body["authType"])
           # 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://itunesconnect.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."
         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
@@ -507,7 +508,7 @@ module Spaceship
       itc_service_key_path = "/tmp/spaceship_itc_service_key.txt"
       return File.read(itc_service_key_path) if File.exist?(itc_service_key_path)
 
-      response = request(:get, "https://olympus.itunes.apple.com/v1/app/config?hostname=itunesconnect.apple.com")
+      response = request(:get, "https://olympus.itunes.apple.com/v1/app/config?hostname=appstoreconnect.apple.com")
       @service_key = response.body["authServiceKey"].to_s
 
       raise "Service key is empty" if @service_key.length == 0
@@ -532,6 +533,7 @@ module Spaceship
         Faraday::Error::TimeoutError,
         Faraday::ParsingError, # <h2>Internal Server Error</h2> with content type json
         AppleTimeoutError,
+        GatewayTimeoutError,
         InternalServerError => ex # New Faraday version: Faraday::TimeoutError => ex
       tries -= 1
       unless tries.zero?
@@ -628,6 +630,8 @@ module Spaceship
         raise_insuffient_permission_error!(caller_location: 3)
       elsif body.to_s.include?("Internal Server Error - Read")
         raise InternalServerError, "Received an internal server error from App Store Connect / Developer Portal, please try again later"
+      elsif body.to_s.include?("Gateway Timeout - In read")
+        raise GatewayTimeoutError, "Received a gateway timeout error from App Store Connect / Developer Portal, please try again later"
       elsif (body["resultString"] || "").include?("Program License Agreement")
         raise ProgramLicenseAgreementUpdated, "#{body['userString']} Please manually log into your Apple Developer account to review and accept the updated agreement."
       end

data/spaceship/lib/spaceship/errors.rb

@@ -70,4 +70,7 @@ module Spaceship
 
   # Raised when 500 is received from App Store Connect
   class InternalServerError < BasicPreferredInfoError; end
+
+  # Raised when 504 is received from App Store Connect
+  class GatewayTimeoutError < BasicPreferredInfoError; end
 end

data/spaceship/lib/spaceship/portal/app.rb

@@ -1,5 +1,6 @@
 require_relative 'portal_base'
 require_relative 'app_group'
+require_relative 'cloud_container'
 
 module Spaceship
   module Portal
@@ -57,6 +58,9 @@ module Spaceship
       # @return (Array of Spaceship::Portal::AppGroup) Associated groups
       attr_accessor :associated_groups
 
+      # @return (Array of Spaceship::Portal::CloudContainer) Associated cloud containers
+      attr_accessor :associated_cloud_containers
+
       attr_mapping(
         'appIdId' => :app_id,
         'name' => :name,
@@ -70,7 +74,8 @@ module Spaceship
         'isProdPushEnabled' => :prod_push_enabled,
         'associatedApplicationGroupsCount' => :app_groups_count,
         'associatedCloudContainersCount' => :cloud_containers_count,
-        'associatedIdentifiersCount' => :identifiers_count
+        'associatedIdentifiersCount' => :identifiers_count,
+        'associatedCloudContainers' => :associated_cloud_containers
       )
 
       class << self
@@ -117,6 +122,14 @@ module Spaceship
         end
       end
 
+      def associated_cloud_containers
+        return unless raw_data['associatedCloudContainers']
+
+        @associated_cloud_containers ||= raw_data['associatedCloudContainers'].map do |info|
+          Spaceship::Portal::CloudContainer.new(info)
+        end
+      end
+
       # Delete this App ID. This action will most likely fail if the App ID is already in the store
       # or there are active profiles
       # @return (App) The app you just deletd
@@ -147,6 +160,14 @@ module Spaceship
         self.class.factory(app)
       end
 
+      # Associate specific iCloud Containers with this app
+      # @return (App) The updated detailed app. This is nil if the app couldn't be found.
+      def associate_cloud_containers(containers)
+        raise "`associate_cloud_containers` not available for Mac apps" if mac?
+        app = client.associate_cloud_containers_with_app(self, containers)
+        self.class.factory(app)
+      end
+
       # Associate specific merchants with this app
       # @return (App) The updated detailed app. This is nil if the app couldn't be found
       def associate_merchants(merchants)

data/spaceship/lib/spaceship/portal/cloud_container.rb

@@ -0,0 +1,74 @@
+require_relative 'portal_base'
+
+module Spaceship
+  module Portal
+    # Represents an iCloud Container of the Apple Dev Portal
+    class CloudContainer < PortalBase
+      # @return (String) The identifier assigned to this container
+      # @example
+      #   "iCloud.com.example.application"
+      attr_accessor :identifier
+
+      # @return (String) The prefix assigned to this container
+      # @example
+      #   "9J57U9392R"
+      attr_accessor :prefix
+
+      # @return (String) The name of this container
+      # @example
+      #   "iCloud com example application"
+      attr_accessor :name
+
+      # @return (String) Status of the container
+      # @example
+      #   "current"
+      attr_accessor :status
+
+      # @return (String) The identifier of this iCloud container, provided by the Dev Portal
+      # @example
+      #   "2MAY7NPHAA"
+      attr_accessor :cloud_container
+
+      # @return (Bool) Is the container editable?
+      attr_accessor :can_edit
+
+      # @return (Bool) Is the container deletable?
+      attr_accessor :can_delete
+
+      attr_mapping(
+        'identifier' => :identifier,
+        'prefix' => :prefix,
+        'name' => :name,
+        'cloudContainer' => :cloud_container,
+        'status' => :status,
+        'canEdit' => :can_edit,
+        'canDelete' => :can_delete
+      )
+
+      class << self
+        # @return (Array) Returns all iCloud containers available for this account
+        def all
+          client.cloud_containers.map { |container| self.factory(container) }
+        end
+
+        # Creates a new iCloud Container on the Apple Dev Portal
+        #
+        # @param identifier [String] the identifier to assign to this container
+        # @param name [String] the name of the container
+        # @return (CloudContainer) The container you just created
+        def create!(identifier: nil, name: nil)
+          new_container = client.create_cloud_container!(name, identifier)
+          self.new(new_container)
+        end
+
+        # Find a specific iCloud Container identifier
+        # @return (CloudContainer) The iCloud Container you're looking for. This is nil if the container can't be found.
+        def find(identifier)
+          all.find do |container|
+            container.identifier == identifier
+          end
+        end
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/portal/portal.rb

@@ -4,6 +4,7 @@ require 'spaceship/portal/website_push'
 require 'spaceship/portal/app_group'
 require 'spaceship/portal/app_service'
 require 'spaceship/portal/certificate'
+require 'spaceship/portal/cloud_container'
 require 'spaceship/portal/device'
 require 'spaceship/portal/provisioning_profile'
 require 'spaceship/portal/portal_client'

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -2,6 +2,7 @@ require_relative '../client'
 
 require_relative 'app'
 require_relative 'app_group'
+require_relative 'cloud_container'
 require_relative 'device'
 require_relative 'merchant'
 require_relative 'passbook'
@@ -149,6 +150,18 @@ module Spaceship
       details_for_app(app)
     end
 
+    def associate_cloud_containers_with_app(app, containers)
+      ensure_csrf(Spaceship::Portal::CloudContainer)
+
+      request(:post, 'account/ios/identifiers/assignCloudContainerToAppId.action', {
+          teamId: team_id,
+          appIdId: app.app_id,
+          cloudContainers: containers.map(&:cloud_container)
+      })
+
+      details_for_app(app)
+    end
+
     def associate_merchants_with_app(app, merchants, mac)
       ensure_csrf(Spaceship::Portal::Merchant)
 
@@ -375,6 +388,37 @@ module Spaceship
       parse_response(r)
     end
 
+    #####################################################
+    # @!group Cloud Containers
+    #####################################################
+
+    def cloud_containers
+      paging do |page_number|
+        r = request(:post, 'account/cloudContainer/listCloudContainers.action', {
+            teamId: team_id,
+            pageNumber: page_number,
+            pageSize: page_size,
+            sort: 'name=asc'
+        })
+        result = parse_response(r, 'cloudContainerList')
+
+        csrf_cache[Spaceship::Portal::CloudContainer] = self.csrf_tokens
+
+        result
+      end
+    end
+
+    def create_cloud_container!(name, identifier)
+      ensure_csrf(Spaceship::Portal::CloudContainer)
+
+      r = request(:post, 'account/cloudContainer/addCloudContainer.action', {
+          name: valid_name_for(name),
+          identifier: identifier,
+          teamId: team_id
+      })
+      parse_response(r, 'cloudContainer')
+    end
+
     #####################################################
     # @!group Team
     #####################################################
@@ -656,10 +700,7 @@ module Spaceship
     end
 
     def delete_provisioning_profile!(profile_id, mac: false)
-      ensure_csrf(Spaceship::Portal::ProvisioningProfile) do
-        fetch_csrf_token_for_provisioning
-      end
-
+      fetch_csrf_token_for_provisioning
       r = request(:post, "account/#{platform_slug(mac)}/profile/deleteProvisioningProfile.action", {
         teamId: team_id,
         provisioningProfileId: profile_id

data/spaceship/lib/spaceship/portal/spaceship.rb

@@ -70,6 +70,11 @@ module Spaceship
         Spaceship::Portal::AppService
       end
 
+      # @return (Class) Access the iCloud Containers for the spaceship
+      def cloud_container
+        Spaceship::Portal::CloudContainer.set_client(@client)
+      end
+
       # @return (Class) Access the devices for the spaceship
       def device
         Spaceship::Portal::Device.set_client(@client)
@@ -122,6 +127,10 @@ module Spaceship
       Spaceship::Portal.app_service
     end
 
+    def cloud_container
+      Spaceship::Portal.cloud_container
+    end
+
     def device
       Spaceship::Portal.device
     end

data/spaceship/lib/spaceship/test_flight/client.rb

@@ -15,7 +15,7 @@ module Spaceship
       # Each request method should make only one request. For more high-level logic, put code in the data models.
 
       def self.hostname
-        'https://itunesconnect.apple.com/testflight/v2/'
+        'https://appstoreconnect.apple.com/testflight/v2/'
       end
 
       ##

data/spaceship/lib/spaceship/tunes/app_ratings.rb

@@ -46,8 +46,8 @@ module Spaceship
       end
 
       # @return (Array) of Review Objects
-      def reviews(store_front = '', version_id = '')
-        raw_reviews = client.get_reviews(application.apple_id, application.platform, store_front, version_id)
+      def reviews(store_front = '', version_id = '', upto_date = nil)
+        raw_reviews = client.get_reviews(application.apple_id, application.platform, store_front, version_id, upto_date)
         raw_reviews.map do |review|
           review["value"]["application"] = self.application
           AppReview.factory(review["value"])

data/spaceship/lib/spaceship/tunes/app_submission.rb

@@ -12,6 +12,11 @@ module Spaceship
       # @return (AppVersion) The version to use for this submission
       attr_accessor :version
 
+      # @return (String) The platform of the device. This is usually "ios"
+      # @example
+      #   "appletvos"
+      attr_accessor :platform
+
       # @return (Boolean) Submitted for Review
       attr_accessor :submitted_for_review
 
@@ -115,10 +120,11 @@ module Spaceship
         end
 
         # @param application (Spaceship::Tunes::Application) The app this submission is for
-        def create(application, version)
-          attrs = client.prepare_app_submissions(application.apple_id, application.edit_version.version_id)
+        def create(application, version, platform: nil)
+          attrs = client.prepare_app_submissions(application.apple_id, application.edit_version(platform: platform).version_id)
           attrs[:application] = application
           attrs[:version] = version
+          attrs[:platform] = platform
 
           return self.factory(attrs)
         end
@@ -142,7 +148,7 @@ module Spaceship
           )
         end
 
-        client.send_app_submission(application.apple_id, application.edit_version.version_id, raw_data_clone)
+        client.send_app_submission(application.apple_id, application.edit_version(platform: platform).version_id, raw_data_clone)
         @submitted_for_review = true
       end
 

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -405,7 +405,7 @@ module Spaceship
 
       # @return (String) An URL to this specific resource. You can enter this URL into your browser
       def url
-        url = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/#{application.apple_id}/#{self.platform}/versioninfo/"
+        url = "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/#{application.apple_id}/#{self.platform}/versioninfo/"
         url += "deliverable" if self.is_live?
         return url
       end

data/spaceship/lib/spaceship/tunes/application.rb

@@ -138,7 +138,7 @@ module Spaceship
 
       # @return (String) An URL to this specific resource. You can enter this URL into your browser
       def url
-        "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/#{self.apple_id}"
+        "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/#{self.apple_id}"
       end
 
       def analytics
@@ -357,13 +357,13 @@ module Spaceship
       # @!group Submit for Review
       #####################################################
 
-      def create_submission
-        version = self.latest_version
+      def create_submission(platform: nil)
+        version = self.latest_version(platform: platform)
         if version.nil?
           raise "Could not find a valid version to submit for review"
         end
 
-        Spaceship::Tunes::AppSubmission.create(self, version)
+        Spaceship::Tunes::AppSubmission.create(self, version, platform: platform)
       end
 
       # Cancels all ongoing TestFlight beta submission for this application

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -50,7 +50,7 @@ module Spaceship
     #####################################################
 
     def self.hostname
-      "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/"
+      "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/"
     end
 
     # Shows a team selection for the user in the terminal. This should not be
@@ -358,10 +358,13 @@ module Spaceship
       parse_response(r, 'data')
     end
 
-    def get_reviews(app_id, platform, storefront, version_id)
+    def get_reviews(app_id, platform, storefront, version_id, upto_date = nil)
       index = 0
       per_page = 100 # apple default
       all_reviews = []
+
+      upto_date = Time.parse(upto_date) unless upto_date.nil?
+
       loop do
         rating_url = "ra/apps/#{app_id}/platforms/#{platform}/reviews?"
         rating_url << "sort=REVIEW_SORT_ORDER_MOST_RECENT"
@@ -371,12 +374,20 @@ module Spaceship
 
         r = request(:get, rating_url)
         all_reviews.concat(parse_response(r, 'data')['reviews'])
+        last_review_date = Time.at(all_reviews[-1]['value']['lastModified'] / 1000)
+
+        if upto_date && last_review_date < upto_date
+          all_reviews = all_reviews.select { |review| Time.at(review['value']['lastModified'] / 1000) > upto_date }
+          break
+        end
+
         if all_reviews.count < parse_response(r, 'data')['reviewCount']
           index += per_page
         else
           break
         end
       end
+
       all_reviews
     end