fastlane 2.149.1 → 2.150.0.rc5

data/produce/lib/produce/itunes_connect.rb

@@ -1,7 +1,7 @@
 require 'spaceship'
 require 'spaceship/tunes/tunes'
+require 'fastlane_core/languages'
 require_relative 'module'
-require_relative 'available_default_languages'
 
 module Produce
   class ItunesConnect
@@ -18,24 +18,34 @@ module Produce
     def create_new_app
       application = fetch_application
       if application
-        UI.success("App '#{Produce.config[:app_identifier]}' already exists (#{application.apple_id}), nothing to do on App Store Connect")
+        UI.success("App '#{Produce.config[:app_identifier]}' already exists (#{application.id}), nothing to do on App Store Connect")
         # Nothing to do here
       else
+        emails = Produce.config[:itc_users] || []
+        user_ids = []
+        unless emails.empty?
+          UI.message("Verifying users exist before creating app...")
+          user_ids = find_user_ids(emails: emails)
+        end
+
         UI.success("Creating new app '#{Produce.config[:app_name]}' on App Store Connect")
 
         platforms = Produce.config[:platforms] || [Produce.config[:platform]]
 
-        Produce.config[:bundle_identifier_suffix] = '' unless wildcard_bundle?
-        generated_app = Spaceship::Tunes::Application.create!(name: Produce.config[:app_name],
-                                                              primary_language: language,
-                                                              sku: Produce.config[:sku].to_s, # might be an int
-                                                              bundle_id: app_identifier,
-                                                              bundle_id_suffix: Produce.config[:bundle_identifier_suffix],
-                                                              company_name: Produce.config[:company_name],
-                                                              platforms: platforms,
-                                                              itunes_connect_users: Produce.config[:itc_users])
+        platforms = platforms.map do |platform|
+          Spaceship::ConnectAPI::Platform.map(platform)
+        end
 
-        UI.crash!("Something went wrong when creating the new app on iTC") if generated_app["adamId"].to_s.empty?
+        # Produce.config[:itc_users]
+        application = Spaceship::ConnectAPI::App.create(
+          name: Produce.config[:app_name],
+          version_string: Produce.config[:app_version] || "1.0",
+          sku: Produce.config[:sku].to_s,
+          primary_locale: language,
+          bundle_id: app_identifier,
+          platforms: platforms,
+          company_name: Produce.config[:company_name]
+        )
 
         application = fetch_application
         counter = 0
@@ -57,10 +67,30 @@ module Produce
           application.ensure_version!(Produce.config[:app_version], platform: platform) if Produce.config[:app_version]
         end
 
-        UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.apple_id}")
+        # Add users to app
+        unless user_ids.empty?
+          application.add_users(user_ids: user_ids)
+          UI.message("Successfuly added #{user_ids.size} #{user_ids.count == 1 ? 'user' : 'users'} to app")
+        end
+
+        UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.id}")
       end
 
-      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: platform == "osx").apple_id
+      return application.id
+    end
+
+    def find_user_ids(emails: nil)
+      emails ||= []
+      users = Spaceship::ConnectAPI::User.all.select do |user|
+        emails.include?(user.email)
+      end
+
+      diff_emails = emails - users.map(&:email)
+      unless diff_emails.empty?
+        raise "Could not find users with emails of: #{diff_emails.join(',')}"
+      end
+
+      return users.map(&:id)
     end
 
     private
@@ -70,7 +100,7 @@ module Produce
     end
 
     def fetch_application
-      Spaceship::Tunes::Application.find(@full_bundle_identifier)
+      Spaceship::ConnectAPI::App.find(@full_bundle_identifier)
     end
 
     def wildcard_bundle?
@@ -82,16 +112,24 @@ module Produce
     end
 
     # Makes sure to get the value for the language
-    # Instead of using the user's value `UK English` spaceship should send
-    # `English_UK` to the server
+    # Instead of using the user's value `UK English` spaceship should send `en-UK`
     def language
       @language = Produce.config[:language]
 
-      converted = Spaceship::Tunes::LanguageConverter.from_itc_readable_to_itc(@language)
-      @language = converted if converted # overwrite it with the actual value
+      unless FastlaneCore::Languages::ALL_LANGUAGES.include?(@language)
+        mapped_language = Spaceship::Tunes::LanguageConverter.from_standard_to_itc_locale(@language)
+        if mapped_language.to_s.empty?
+          message = [
+            "Sending language name is deprecated. Could not map '#{@language}' to a locale.",
+            "Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}"
+          ].join("\n")
+          UI.user_error!(message)
+        end
+
+        UI.deprecated("Sending language name is deprecated. '#{@language}' has been mapped to '#{mapped_language}'.")
+        UI.deprecated("Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}")
 
-      unless AvailableDefaultLanguages.all_languages.include?(@language)
-        UI.user_error!("Please enter one of available languages: #{AvailableDefaultLanguages.all_languages}")
+        @language = mapped_language
       end
 
       return @language

data/produce/lib/produce/options.rb

@@ -54,7 +54,7 @@ module Produce
                                      optional: true,
                                      default_value: "ios",
                                      verify_block: proc do |value|
-                                                     UI.user_error!("The platform can only be ios or osx") unless %('ios', 'osx').include?(value)
+                                                     UI.user_error!("The platform can only be ios or osx") unless %('ios', 'osx', 'tvos').include?(value)
                                                    end),
         FastlaneCore::ConfigItem.new(key: :platforms,
                                      short_option: "-J",
@@ -64,13 +64,13 @@ module Produce
                                      optional: true,
                                      type: Array,
                                      verify_block: proc do |values|
-                                                     types = %w(ios osx)
+                                                     types = %w(ios osx tvos)
                                                      UI.user_error!("The platform can only be #{types}") unless (values - types).empty?
                                                    end),
         FastlaneCore::ConfigItem.new(key: :language,
                                      short_option: "-m",
                                      env_name: "PRODUCE_LANGUAGE",
-                                     description: "Primary Language (e.g. 'English', 'German')",
+                                     description: "Primary Language (e.g. 'en-US', 'fr-FR')",
                                      default_value: "English",
                                      verify_block: proc do |language|
                                      end),

data/sigh/lib/assets/resign.sh

@@ -620,7 +620,7 @@ function resign {
         # Start with using what comes in provisioning profile entitlements before patching
         cp -f "$PROFILE_ENTITLEMENTS" "$PATCHED_ENTITLEMENTS"
 
-        log "Removing blacklisted keys from patched profile"
+        log "Removing denylisted keys from patched profile"
         # See https://github.com/facebook/buck/issues/798 and https://github.com/facebook/buck/pull/802/files
 
         # Update in https://github.com/facebook/buck/commit/99c0fbc3ab5ecf04d186913374f660683deccdef
@@ -628,7 +628,7 @@ function resign {
 
         # Buck changes referenced above are not self-explanatory and do not seem exhaustive or up-to-date
         # Comments below explain the rules applied to each key in order to make realignment with future Xcode export logic easier
-        BLACKLISTED_KEYS=(\
+        DENYLISTED_KEYS=(\
             # PP list identifiers inconsistent with app-defined ones and this key does not seem to appear in IPA entitlements, so ignore it
             "com.apple.developer.icloud-container-development-container-identifiers" \
             # This key has an invalid generic value in PP (actual value is set by Xcode during export), see dedicated processing a few blocks below
@@ -637,7 +637,7 @@ function resign {
             "com.apple.developer.icloud-container-identifiers" \
             # PP enable all available services and not app-defined ones, must use App entitlements value
             "com.apple.developer.icloud-services" \
-            # Was already blacklisted in previous version, but has someone ever seen this key in a PP?
+            # Was already denylisted in previous version, but has someone ever seen this key in a PP?
             "com.apple.developer.restricted-resource-mode" \
             # If actually used by the App, this value will be set in its entitlements
             "com.apple.developer.nfc.readersession.formats" \
@@ -675,15 +675,15 @@ function resign {
             "com.apple.developer.default-data-protection" \
             # PP seem to list the same groups as the App, but use App entitlements value to be sure
             "com.apple.security.application-groups" \
-            # Was already blacklisted in previous version, seems to be an artifact from an old Xcode release
+            # Was already denylisted in previous version, seems to be an artifact from an old Xcode release
             "com.apple.developer.maps" \
             # If actually used by the App, this value will be set in its entitlements
             "com.apple.external-accessory.wireless-configuration"
         )
 
-        # Blacklisted keys must not be included into new profile, so remove them from patched profile
-        for KEY in "${BLACKLISTED_KEYS[@]}"; do
-            log "Removing blacklisted key: $KEY"
+        # Denylisted keys must not be included into new profile, so remove them from patched profile
+        for KEY in "${DENYLISTED_KEYS[@]}"; do
+            log "Removing denylisted key: $KEY"
             PlistBuddy -c "Delete $KEY" "$PATCHED_ENTITLEMENTS" 2>/dev/null
         done
 

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -218,7 +218,7 @@ open class Snapshot: NSObject {
 
 private extension XCUIElementAttributes {
     var isNetworkLoadingIndicator: Bool {
-        if hasWhiteListedIdentifier { return false }
+        if hasAllowListedIdentifier { return false }
 
         let hasOldLoadingIndicatorSize = frame.size == CGSize(width: 10, height: 20)
         let hasNewLoadingIndicatorSize = frame.size.width.isBetween(46, and: 47) && frame.size.height.isBetween(2, and: 3)
@@ -226,10 +226,10 @@ private extension XCUIElementAttributes {
         return hasOldLoadingIndicatorSize || hasNewLoadingIndicatorSize
     }
 
-    var hasWhiteListedIdentifier: Bool {
-        let whiteListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
+    var hasAllowListedIdentifier: Bool {
+        let allowListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
 
-        return whiteListedIdentifiers.contains(identifier)
+        return allowListedIdentifiers.contains(identifier)
     }
 
     func isStatusBar(_ deviceWidth: CGFloat) -> Bool {
@@ -279,4 +279,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.22]
+// SnapshotHelperVersion [1.23]

data/snapshot/lib/assets/SnapshotHelperXcode8.swift

@@ -159,8 +159,8 @@ open class Snapshot: NSObject {
 
 extension XCUIElement {
     var isLoadingIndicator: Bool {
-        let whiteListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
-        if whiteListedLoaders.contains(self.identifier) {
+        let allowListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
+        if allowListedLoaders.contains(self.identifier) {
             return false
         }
         return self.frame.size == CGSize(width: 10, height: 20)
@@ -169,4 +169,4 @@ extension XCUIElement {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperXcode8Version [1.4]
+// SnapshotHelperXcode8Version [1.5]

data/snapshot/lib/snapshot/options.rb

@@ -156,7 +156,6 @@ module Snapshot
                                      env_name: 'SNAPSHOT_HTML_TEMPLATE',
                                      short_option: "-e",
                                      description: "A path to screenshots.html template",
-                                     default_value: File.join(Snapshot::ROOT, "lib", "snapshot/page.html.erb"),
                                      optional: true),
 
         # Everything around building

data/snapshot/lib/snapshot/reports_generator.rb

@@ -5,6 +5,14 @@ module Snapshot
     require 'erb'
     require 'fastimage'
 
+    def html_path
+      if Snapshot.config[:html_template]
+        Snapshot.config[:html_template]
+      else
+        File.join(Snapshot::ROOT, "lib", "snapshot/page.html.erb")
+      end
+    end
+
     def generate
       UI.message("Generating HTML Report")
 
@@ -36,7 +44,6 @@ module Snapshot
         end
       end
 
-      html_path = Snapshot.config[:html_template]
       html = ERB.new(File.read(html_path)).result(binding) # https://web.archive.org/web/20160430190141/www.rrn.dk/rubys-erb-templating-system
 
       export_path = "#{screens_path}/screenshots.html"

data/spaceship/lib/spaceship/client.rb

@@ -194,15 +194,16 @@ module Spaceship
       self.new(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
     end
 
-    def initialize(cookie: nil, current_team_id: nil)
+    def initialize(cookie: nil, current_team_id: nil, timeout: nil)
       options = {
        request: {
-          timeout:       (ENV["SPACESHIP_TIMEOUT"] || 300).to_i,
-          open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || 300).to_i
+          timeout:       (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i,
+          open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i
         }
       }
       @current_team_id = current_team_id
       @cookie = cookie || HTTP::CookieJar.new
+
       @client = Faraday.new(self.class.hostname, options) do |c|
         c.response(:json, content_type: /\bjson$/)
         c.response(:xml, content_type: /\bxml$/)

data/spaceship/lib/spaceship/connect_api.rb

@@ -1,10 +1,12 @@
 require 'spaceship/connect_api/model'
 require 'spaceship/connect_api/response'
 require 'spaceship/connect_api/token'
+require 'spaceship/connect_api/file_uploader'
 
 require 'spaceship/connect_api/provisioning/provisioning'
 require 'spaceship/connect_api/testflight/testflight'
 require 'spaceship/connect_api/users/users'
+require 'spaceship/connect_api/tunes/tunes'
 
 require 'spaceship/connect_api/models/bundle_id_capability'
 require 'spaceship/connect_api/models/bundle_id'
@@ -30,11 +32,32 @@ require 'spaceship/connect_api/models/build_delivery'
 require 'spaceship/connect_api/models/build_beta_detail'
 require 'spaceship/connect_api/models/pre_release_version'
 
+require 'spaceship/connect_api/models/age_rating_declaration'
+require 'spaceship/connect_api/models/app_category'
+require 'spaceship/connect_api/models/app_info'
+require 'spaceship/connect_api/models/app_info_localization'
+require 'spaceship/connect_api/models/app_preview_set'
+require 'spaceship/connect_api/models/app_preview'
+require 'spaceship/connect_api/models/app_price'
+require 'spaceship/connect_api/models/app_price_tier'
+require 'spaceship/connect_api/models/app_review_attachment'
+require 'spaceship/connect_api/models/app_store_review_detail'
+require 'spaceship/connect_api/models/app_store_version_submission'
+require 'spaceship/connect_api/models/app_screenshot_set'
+require 'spaceship/connect_api/models/app_screenshot'
+require 'spaceship/connect_api/models/app_store_version_localization'
+require 'spaceship/connect_api/models/app_store_version_phased_release'
+require 'spaceship/connect_api/models/app_store_version'
+require 'spaceship/connect_api/models/idfa_declaration'
+require 'spaceship/connect_api/models/reset_ratings_request'
+require 'spaceship/connect_api/models/territory'
+
 module Spaceship
   class ConnectAPI
     extend Spaceship::ConnectAPI::Provisioning
     extend Spaceship::ConnectAPI::TestFlight
     extend Spaceship::ConnectAPI::Users
+    extend Spaceship::ConnectAPI::Tunes
 
     @token = nil
 
@@ -63,9 +86,9 @@ module Spaceship
 
         # Map from fastlane input and Spaceship::TestFlight platform values
         case platform.to_sym
-        when :appletvos
+        when :appletvos, :tvos
           return Spaceship::ConnectAPI::Platform::TV_OS
-        when :osx
+        when :osx, :macos, :mac
           return Spaceship::ConnectAPI::Platform::MAC_OS
         when :ios
           return Spaceship::ConnectAPI::Platform::IOS

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

@@ -13,7 +13,7 @@ module Spaceship
       # Instantiates a client with cookie session or a JWT token.
       def initialize(cookie: nil, current_team_id: nil, token: nil)
         if token.nil?
-          super(cookie: cookie, current_team_id: current_team_id)
+          super(cookie: cookie, current_team_id: current_team_id, timeout: 1200)
         else
           options = {
             request: {
@@ -78,46 +78,76 @@ module Spaceship
       end
 
       def get(url_or_path, params = nil)
-        response = request(:get) do |req|
-          req.url(url_or_path)
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params if params
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:get) do |req|
+            req.url(url_or_path)
+            req.options.params_encoder = Faraday::NestedParamsEncoder
+            req.params = params if params
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def post(url_or_path, body)
-        response = request(:post) do |req|
-          req.url(url_or_path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:post) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def patch(url_or_path, body)
-        response = request(:patch) do |req|
-          req.url(url_or_path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:patch) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def delete(url_or_path, params = nil, body = nil)
-        response = request(:delete) do |req|
-          req.url(url_or_path)
-          req.options.params_encoder = Faraday::NestedParamsEncoder if params
-          req.params = params if params
-          req.body = body.to_json if body
-          req.headers['Content-Type'] = 'application/json' if body
+        response = with_asc_retry do
+          request(:delete) do |req|
+            req.url(url_or_path)
+            req.options.params_encoder = Faraday::NestedParamsEncoder if params
+            req.params = params if params
+            req.body = body.to_json if body
+            req.headers['Content-Type'] = 'application/json' if body
+          end
         end
         handle_response(response)
       end
 
       protected
 
+      def with_asc_retry(tries = 5, &_block)
+        tries = 1 if Object.const_defined?("SpecHelper")
+        response = yield
+
+        tries -= 1
+        status = response.status if response
+
+        if [500, 504].include?(status)
+          msg = "Timeout received! Retrying after 3 seconds (remaining: #{tries})..."
+          raise msg
+        end
+
+        return response
+      rescue => error
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          return response
+        else
+          retry
+        end
+      end
+
       def handle_response(response)
         if (200...300).cover?(response.status) && (response.body.nil? || response.body.empty?)
           return
@@ -141,21 +171,57 @@ module Spaceship
       def handle_errors(response)
         # Example error format
         # {
-        #   "errors" : [ {
-        #     "id" : "ce8c391e-f858-411b-a14b-5aa26e0915f2",
-        #     "status" : "400",
-        #     "code" : "PARAMETER_ERROR.INVALID",
-        #     "title" : "A parameter has an invalid value",
-        #     "detail" : "'uploadedDate3' is not a valid field name",
-        #     "source" : {
-        #       "parameter" : "sort"
+        # "errors":[
+        #     {
+        #       "id":"cbfd8674-4802-4857-bfe8-444e1ea36e32",
+        #       "status":"409",
+        #       "code":"STATE_ERROR",
+        #       "title":"The request cannot be fulfilled because of the state of another resource.",
+        #       "detail":"Submit for review errors found.",
+        #       "meta":{
+        #           "associatedErrors":{
+        #             "/v1/appScreenshots/":[
+        #                 {
+        #                   "id":"23d1734f-b81f-411a-98e4-6d3e763d54ed",
+        #                   "status":"409",
+        #                   "code":"STATE_ERROR.SCREENSHOT_REQUIRED.APP_WATCH_SERIES_4",
+        #                   "title":"App screenshot missing (APP_WATCH_SERIES_4)."
+        #                 },
+        #                 {
+        #                   "id":"db993030-0a93-48e9-9fd7-7e5676633431",
+        #                   "status":"409",
+        #                   "code":"STATE_ERROR.SCREENSHOT_REQUIRED.APP_WATCH_SERIES_4",
+        #                   "title":"App screenshot missing (APP_WATCH_SERIES_4)."
+        #                 }
+        #             ],
+        #             "/v1/builds/d710b6fa-5235-4fe4-b791-2b80d6818db0":[
+        #                 {
+        #                   "id":"e421fe6f-0e3b-464b-89dc-ba437e7bb77d",
+        #                   "status":"409",
+        #                   "code":"ENTITY_ERROR.ATTRIBUTE.REQUIRED",
+        #                   "title":"The provided entity is missing a required attribute",
+        #                   "detail":"You must provide a value for the attribute 'usesNonExemptEncryption' with this request",
+        #                   "source":{
+        #                       "pointer":"/data/attributes/usesNonExemptEncryption"
+        #                   }
+        #                 }
+        #             ]
+        #           }
+        #       }
         #     }
-        #   } ]
+        # ]
         # }
 
         return response.body['errors'].map do |error|
-          "#{error['title']} - #{error['detail']}"
-        end.join(" ")
+          messages = [[error['title'], error['detail']].compact.join(" - ")]
+
+          meta = error["meta"] || {}
+          associated_errors = meta["associatedErrors"] || {}
+
+          messages + associated_errors.values.flatten.map do |associated_error|
+            [[associated_error["title"], associated_error["detail"]].compact.join(" - ")]
+          end
+        end.flatten.join("\n")
       end
 
       private