fastlane 2.150.0.rc1 → 2.150.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0da99338a957f184c8f61225f84bbea77cf2e295f9a7fc21918095ec2967e3
-  data.tar.gz: '0998f1c0adaa75fcabb51584113223c552268c9f86c844771bdc27b1f74f10d1'
+  metadata.gz: 0a5dd73db52643b353f17026fd0cfae042ef1586aa20770a0ed4b60d29f7454e
+  data.tar.gz: 8d01ca66b6b52465320701478986038cf2416f43dfa307a84504740fa25cc967
 SHA512:
-  metadata.gz: 49d0496a16e951b91d512f972d8e5a5f4af1bae7bc68f8a71f32d328b3e1868e0d3b5dfa948723e7c82414f3c2672a6ec73a99884822ccec740aabd2ef1632a7
-  data.tar.gz: 508186460c3e7e4c13bef4f3ad019a5f81374ddaffd32844aa079e02c2165dbb2c454aa2441e150c865aa3c42f526af7dbf494d53911ebfe99cbc02ae2cf5d3d
+  metadata.gz: 66f423b88a3d7fb5b9e7634f0918e5d13685dbc01ec4a332fa3eac07ab092efb392e84f3247fd70818a32665af5c70aa39baac6d533f122956b6c45b515462d7
+  data.tar.gz: 96d81a5f13c8df5f196f91607d6be870bc57ad8c4fcfdcc515c2eddb80cb83a28b02357cc0ce4319b6259b764167804c7c3d55418449343c6db5acb523d99dca

data/deliver/lib/deliver/runner.rb

@@ -114,9 +114,6 @@ module Deliver
       # Assign "default" values to all languages
       upload_metadata.assign_defaults(options)
 
-      # Handle app icon / watch icon
-      prepare_app_icons(options)
-
       # Validate
       validate_html(screenshots)
 
@@ -126,20 +123,6 @@ module Deliver
       UploadPriceTier.new.upload(options)
     end
 
-    # If options[:app_icon]/options[:apple_watch_app_icon]
-    # is supplied value/path will be used.
-    # If it is unset files (app_icon/watch_icon) exists in
-    # the fastlane/metadata/ folder, those will be used
-    def prepare_app_icons(options = {})
-      return unless options[:metadata_path]
-
-      default_app_icon_path = Dir[File.join(options[:metadata_path], "app_icon.{png,jpg}")].first
-      options[:app_icon] ||= default_app_icon_path if default_app_icon_path && File.exist?(default_app_icon_path)
-
-      default_watch_icon_path = Dir[File.join(options[:metadata_path], "watch_icon.{png,jpg}")].first
-      options[:apple_watch_app_icon] ||= default_watch_icon_path if default_watch_icon_path && File.exist?(default_watch_icon_path)
-    end
-
     # Upload the binary to App Store Connect
     def upload_binary
       UI.message("Uploading binary to App Store Connect")

data/deliver/lib/deliver/submit_for_review.rb

@@ -61,55 +61,79 @@ module Deliver
       submission_information = options[:submission_information] || {}
       uses_encryption = submission_information[:export_compliance_uses_encryption]
 
-      UI.verbose("Updating build for export compliance status of '#{uses_encryption}'")
       if build.uses_non_exempt_encryption.nil?
+        UI.verbose("Updating build for export compliance status of '#{uses_encryption}'")
+
+        if uses_encryption.to_s.empty?
+          message = [
+            "Export compliance is required to submit",
+            "Add information to the :submission_information option...",
+            "  Docs: http://docs.fastlane.tools/actions/deliver/#compliance-and-idfa-settings",
+            "  Example: submission_information: { export_compliance_uses_encryption: false }",
+            "This can also be set in your Info.plist with key 'ITSAppUsesNonExemptEncryption'"
+          ].join("\n")
+          UI.user_error!(message)
+        end
+
         build = build.update(attributes: {
           usesNonExemptEncryption: uses_encryption
         })
+
+        UI.verbose("Successfully updated build for export compliance status of '#{build.uses_non_exempt_encryption}' on App Store Connect")
       end
-      UI.verbose("Updated build for export compliance status of '#{build.uses_non_exempt_encryption}'")
     end
 
     def update_idfa(options, app, version)
       submission_information = options[:submission_information] || {}
-      return unless submission_information.include?(:add_id_info_uses_idfa)
-
       uses_idfa = submission_information[:add_id_info_uses_idfa]
+
       idfa_declaration = begin
                            version.fetch_idfa_declaration
                          rescue
                            nil
                          end
 
+      # Set IDFA on version
       UI.verbose("Updating app store version for IDFA status of '#{uses_idfa}'")
-      version = version.update(attributes: {
-        usesIdfa: uses_idfa
-      })
+      unless uses_idfa.nil?
+        version = version.update(attributes: {
+          usesIdfa: uses_idfa
+        })
+      end
       UI.verbose("Updated app store version for IDFA status of '#{version.uses_idfa}'")
 
+      # Error if uses_idfa not set
+      if version.uses_idfa.nil?
+        message = [
+          "Use of Advertising Identifier (IDFA) is required to submit",
+          "Add information to the :submission_information option...",
+          "  Docs: http://docs.fastlane.tools/actions/deliver/#compliance-and-idfa-settings",
+          "  Example: submission_information: { add_id_info_uses_idfa: false }",
+          "  Example: submission_information: {",
+          "    add_id_info_uses_idfa: true,",
+          "    add_id_info_limits_tracking: false,",
+          "    add_id_info_serves_ads: false,",
+          "    add_id_info_uses_idfa: false,",
+          "    add_id_info_tracks_install: false",
+          "  }"
+        ].join("\n")
+        UI.user_error!(message)
+      end
+
+      # Create, update, or delete IDFA declaration
       if uses_idfa == false
         if idfa_declaration
           UI.verbose("Deleting IDFA delcaration")
           idfa_declaration.delete!
           UI.verbose("Deleted IDFA delcaration")
         end
-      else
-        attributes = {}
-        if submission_information.include?(:add_id_info_limits_tracking)
-          attributes[:honorsLimitedAdTracking] = submission_information[:add_id_info_limits_tracking]
-        end
-
-        if submission_information.include?(:add_id_info_serves_ads)
-          attributes[:servesAds] = submission_information[:add_id_info_serves_ads]
-        end
-
-        if submission_information.include?(:add_id_info_tracks_install)
-          attributes[:attributesAppInstallationToPreviousAd] = submission_information[:add_id_info_tracks_install]
-        end
-
-        if submission_information.include?(:add_id_info_tracks_action)
-          attributes[:attributesActionWithPreviousAd] = submission_information[:add_id_info_tracks_action]
-        end
+      elsif uses_idfa == true
+        attributes = {
+          honorsLimitedAdTracking: !!submission_information[:add_id_info_limits_tracking],
+          servesAds: !!submission_information[:add_id_info_serves_ads],
+          attributesAppInstallationToPreviousAd: !!submission_information[:add_id_info_tracks_install],
+          attributesActionWithPreviousAd: !!submission_information[:add_id_info_tracks_action]
+        }
 
         if idfa_declaration
           UI.verbose("Updating IDFA delcaration")
@@ -122,22 +146,26 @@ module Deliver
         end
       end
 
-      UI.success("Successfully updated IDFA delcarations")
+      UI.success("Successfully updated IDFA delcarations on App Store Connect")
     end
 
     def update_submission_information(options, app)
       submission_information = options[:submission_information] || {}
-      if submission_information.include?(:content_rights_contains_third_party_content)
-        value = if submission_information[:content_rights_contains_third_party_content]
+
+      content_rights = submission_information[:content_rights_contains_third_party_content]
+
+      unless content_rights.nil?
+        value = if content_rights
                   Spaceship::ConnectAPI::App::ContentRightsDeclaration::USES_THIRD_PARTY_CONTENT
                 else
                   Spaceship::ConnectAPI::App::ContentRightsDeclaration::DOES_NOT_USE_THIRD_PARTY_CONTENT
                 end
 
-        UI.success("Updating contents rights declaration on App Store Connect")
+        UI.verbose("Updating contents rights declaration on App Store Connect")
         app.update(attributes: {
           contentRightsDeclaration: value
         })
+        UI.success("Successfully updated contents rights declaration on App Store Connect")
       end
     end
 

data/deliver/lib/deliver/upload_metadata.rb

@@ -192,26 +192,82 @@ module Deliver
       # Update categories
       app_info = app.fetch_edit_app_info
       if app_info
-        app_info.update_categories(
-          primary_category_id: Spaceship::ConnectAPI::AppCategory.map_category_from_itc(
-            options[:primary_category].to_s.strip
-          ),
-          secondary_category_id: Spaceship::ConnectAPI::AppCategory.map_category_from_itc(
-            options[:secondary_category].to_s.strip
-          ),
-          primary_subcategory_one_id: Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
-            options[:primary_first_sub_category].to_s.strip
-          ),
-          primary_subcategory_two_id: Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
-            options[:primary_second_sub_category].to_s.strip
-          ),
-          secondary_subcategory_one_id: Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
-            options[:secondary_first_sub_category].to_s.strip
-          ),
-          secondary_subcategory_two_id: Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
-            options[:secondary_second_sub_category].to_s.strip
+        category_id_map = {}
+
+        primary_category = options[:primary_category].to_s.strip
+        secondary_category = options[:secondary_category].to_s.strip
+        primary_first_sub_category = options[:primary_first_sub_category].to_s.strip
+        primary_second_sub_category = options[:primary_second_sub_category].to_s.strip
+        secondary_first_sub_category = options[:secondary_first_sub_category].to_s.strip
+        secondary_second_sub_category = options[:secondary_second_sub_category].to_s.strip
+
+        mapped_values = {}
+
+        # Only update primary and secondar category if explicitly set
+        unless primary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_category_from_itc(
+            primary_category
+          )
+
+          mapped_values[primary_category] = mapped
+          category_id_map[:primary_category_id] = mapped
+        end
+        unless secondary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_category_from_itc(
+            secondary_category
           )
-        )
+
+          mapped_values[secondary_category] = mapped
+          category_id_map[:secondary_category_id] = mapped
+        end
+
+        # Only set if primary category is going to be set
+        unless primary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
+            primary_first_sub_category
+          )
+
+          mapped_values[primary_first_sub_category] = mapped
+          category_id_map[:primary_subcategory_one_id] = mapped
+        end
+        unless primary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
+            primary_second_sub_category
+          )
+
+          mapped_values[primary_second_sub_category] = mapped
+          category_id_map[:primary_subcategory_two_id] = mapped
+        end
+
+        # Only set if secondary category is going to be set
+        unless secondary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
+            secondary_first_sub_category
+          )
+
+          mapped_values[secondary_first_sub_category] = mapped
+          category_id_map[:secondary_subcategory_one_id] = mapped
+        end
+        unless secondary_category.empty?
+          mapped = Spaceship::ConnectAPI::AppCategory.map_subcategory_from_itc(
+            secondary_second_sub_category
+          )
+
+          mapped_values[secondary_second_sub_category] = mapped
+          category_id_map[:secondary_subcategory_two_id] = mapped
+        end
+
+        # Print deprecation warnings if category was mapped
+        has_mapped_values = false
+        mapped_values.each do |k, v|
+          next if k.nil? || v.nil?
+          next if k == v
+          has_mapped_values = true
+          UI.deprecated("Category '#{k}' from iTunesConnect as been deprecated. Please replace with '#{v}'")
+        end
+        UI.deprecated("You can find more info at https://docs.fastlane.tools/actions/deliver/#reference") if has_mapped_values
+
+        app_info.update_categories(category_id_map: category_id_map)
       end
 
       # Update phased release
@@ -343,7 +399,7 @@ module Deliver
 
       localizations = app_info.get_app_info_localizations
 
-      languages = options[:languages] || []
+      languages = (options[:languages] || []).reject { |lang| lang == "default" }
       locales_to_enable = languages - localizations.map(&:locale)
 
       if locales_to_enable.count > 0
@@ -378,7 +434,7 @@ module Deliver
 
       localizations = version.get_app_store_version_localizations
 
-      languages = options[:languages] || []
+      languages = (options[:languages] || []).reject { |lang| lang == "default" }
       locales_to_enable = languages - localizations.map(&:locale)
 
       if locales_to_enable.count > 0
@@ -517,13 +573,28 @@ module Deliver
       UI.message("Setting the app's age rating...")
 
       # Maping from legacy ITC values to App Store Connect Values
+      mapped_values = {}
       attributes = {}
       json.each do |k, v|
         new_key = Spaceship::ConnectAPI::AgeRatingDeclaration.map_key_from_itc(k)
         new_value = Spaceship::ConnectAPI::AgeRatingDeclaration.map_value_from_itc(new_key, v)
+
+        mapped_values[k] = new_key
+        mapped_values[v] = new_value
+
         attributes[new_key] = new_value
       end
 
+      # Print deprecation warnings if category was mapped
+      has_mapped_values = false
+      mapped_values.each do |k, v|
+        next if k.nil? || v.nil?
+        next if k == v
+        has_mapped_values = true
+        UI.deprecated("Age rating '#{k}' from iTunesConnect as been deprecated. Please replace with '#{v}'")
+      end
+      UI.deprecated("You can find more info at https://docs.fastlane.tools/actions/deliver/#reference") if has_mapped_values
+
       age_rating_delcaration = version.fetch_age_rating_declaration
       age_rating_delcaration.update(attributes: attributes)
     end

data/deliver/lib/deliver/upload_price_tier.rb

@@ -13,9 +13,16 @@ module Deliver
       app_id = legacy_app.apple_id
       app = Spaceship::ConnectAPI::App.get(app_id: app_id)
 
+      attributes = {}
+      territory_ids = []
+
       app_prices = app.fetch_app_prices
       if app_prices.first
-        old_price = app_prices.first.id
+        old_price = app_prices.first.price_tier.id
+      else
+        UI.message("App has no prices yet... Enabling all countries in App Store Connect")
+        territory_ids = Spaceship::ConnectAPI::Territory.all.map(&:id)
+        attributes[:availableInNewTerritories] = true
       end
 
       if price_tier == old_price
@@ -23,7 +30,7 @@ module Deliver
         return
       end
 
-      app.update_app_price_tier(app_price_tier_id: price_tier)
+      app.update(attributes: attributes, app_price_tier_id: price_tier, territory_ids: territory_ids)
       UI.success("Successfully updated the pricing from #{old_price} to #{price_tier}")
     end
   end

data/deliver/lib/deliver/upload_screenshots.rb

@@ -34,13 +34,39 @@ module Deliver
 
           # Iterate over all screenshots for each set and delete
           screenshot_sets = localization.get_app_screenshot_sets
+
+          # Multi threading delete on single localization
+          threads = []
+          errors = []
+
           screenshot_sets.each do |screenshot_set|
             UI.message("Removing all previously uploaded screenshots for '#{localization.locale}' '#{screenshot_set.screenshot_display_type}'...")
             screenshot_set.app_screenshots.each do |screenshot|
               UI.verbose("Deleting screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
-              screenshot.delete!
+              threads << Thread.new do
+                begin
+                  screenshot.delete!
+                  UI.verbose("Deleted screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+                rescue => error
+                  UI.verbose("Failed to delete screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+                  errors << error
+                end
+              end
             end
           end
+
+          sleep(1) # Feels bad but sleeping a bit to let the threads catchup
+
+          unless threads.empty?
+            Helper.show_loading_indicator("Waiting for screenshots to be deleted for '#{localization.locale}'... (might be slow)") unless FastlaneCore::Globals.verbose?
+            threads.each(&:join)
+            Helper.hide_loading_indicator unless FastlaneCore::Globals.verbose?
+          end
+
+          # Crash if any errors happen while deleting
+          unless errors.empty?
+            UI.crash!(errors.map(&:message).join("\n"))
+          end
         end
       end
 

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -494,33 +494,32 @@ Key | Editable While Live | Directory | Filename
 
 ### Available Categories
 
-You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deliver_ supports both notations.
-
-- `Book`
-- `Business`
-- `Apps.Catalogs`
-- `Education`
-- `Entertainment`
-- `Finance`
-- `Apps.Food_Drink`
-- `Games`
-- `Healthcare_Fitness`
-- `Lifestyle`
-- `Medical`
-- `Music`
-- `Navigation`
-- `News`
-- `Apps.Newsstand`
-- `Photography`
-- `Productivity`
-- `Reference`
-- `Apps.Shopping`
-- `SocialNetworking`
-- `Sports`
-- `Stickers`
-- `Travel`
-- `Utilities`
-- `Weather`
+- `FOOD_AND_DRINK`
+- `BUSINESS`
+- `EDUCATION`
+- `SOCIAL_NETWORKING`
+- `BOOKS`
+- `SPORTS`
+- `FINANCE`
+- `REFERENCE`
+- `GRAPHICS_AND_DESIGN`
+- `DEVELOPER_TOOLS`
+- `HEALTH_AND_FITNESS`
+- `MUSIC`
+- `WEATHER`
+- `TRAVEL`
+- `ENTERTAINMENT`
+- `STICKERS`
+- `GAMES`
+- `LIFESTYLE`
+- `MEDICAL`
+- `MAGAZINES_AND_NEWSPAPERS`
+- `UTILITIES`
+- `SHOPPING`
+- `PRODUCTIVITY`
+- `NEWS`
+- `PHOTO_AND_VIDEO`
+- `NAVIGATION`
 
 ### Available Game Subcategories
 
@@ -543,54 +542,40 @@ You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deli
 - `MZGenre.Trivia`
 - `MZGenre.Word`
 
-### Available Magazines & Newspapers Subcategories
-
-- `MZGenre.Apps.Arts_Photography`
-- `MZGenre.Apps.Automotive`
-- `MZGenre.Apps.Brides_Weddings`
-- `MZGenre.Apps.Business_Investing`
-- `MZGenre.Apps.Childrens_Magazines`
-- `MZGenre.Apps.Computers_Internet`
-- `MZGenre.Apps.Cooking_Food_Drink`
-- `MZGenre.Apps.Crafts_Hobbies`
-- `MZGenre.Apps.Electronics_Audio`
-- `MZGenre.Apps.Entertainment`
-- `MZGenre.Apps.Fashion_Style`
-- `MZGenre.Apps.Health_Mind_Body`
-- `MZGenre.Apps.History`
-- `MZGenre.Apps.Home_Garden`
-- `MZGenre.Apps.Literary_Magazines_Journals`
-- `MZGenre.Apps.Mens_Interest`
-- `MZGenre.Apps.Movies_Music`
-- `MZGenre.Apps.News_Politics`
-- `MZGenre.Apps.Outdoors_Nature`
-- `MZGenre.Apps.Parenting_Family`
-- `MZGenre.Apps.Pets`
-- `MZGenre.Apps.Professional_Trade`
-- `MZGenre.Apps.Regional_News`
-- `MZGenre.Apps.Science`
-- `MZGenre.Apps.Sports_Leisure`
-- `MZGenre.Apps.Teens`
-- `MZGenre.Apps.Travel_Regional`
-- `MZGenre.Apps.Womens_Interest`
+- `GAMES_SPORTS`
+- `GAMES_WORD`
+- `GAMES_MUSIC`
+- `GAMES_ADVENTURE`
+- `GAMES_ACTION`
+- `GAMES_ROLE_PLAYING`
+- `GAMES_CASUAL`
+- `GAMES_BOARD`
+- `GAMES_TRIVIA`
+- `GAMES_CARD`
+- `GAMES_PUZZLE`
+- `GAMES_CASINO`
+- `GAMES_STRATEGY`
+- `GAMES_SIMULATION`
+- `GAMES_RACING`
+- `GAMES_FAMILY`
 
 ### Available Stickers Subcategories
 
-- `MZGenre.Apps.Stickers.Animals`
-- `MZGenre.Apps.Stickers.Art`
-- `MZGenre.Apps.Stickers.BirthdaysAndCelebrations`
-- `MZGenre.Apps.Stickers.Celebrities`
-- `MZGenre.Apps.Stickers.Characters`
-- `MZGenre.Apps.Stickers.FoodAndDrink`
-- `MZGenre.Apps.Stickers.Emotions`
-- `MZGenre.Apps.Stickers.Fashion`
-- `MZGenre.Apps.Stickers.Games`
-- `MZGenre.Apps.Stickers.KidsAndFamily`
-- `MZGenre.Apps.Stickers.MoviesAndTV`
-- `MZGenre.Apps.Stickers.Music`
-- `MZGenre.Apps.Stickers.People`
-- `MZGenre.Apps.Stickers.Places`
-- `MZGenre.Apps.Stickers.Sports`
+- `STICKERS_PLACES_AND_OBJECTS`
+- `STICKERS_EMOJI_AND_EXPRESSIONS`
+- `STICKERS_CELEBRATIONS`
+- `STICKERS_CELEBRITIES`
+- `STICKERS_MOVIES_AND_TV`
+- `STICKERS_SPORTS_AND_ACTIVITIES`
+- `STICKERS_EATING_AND_DRINKING`
+- `STICKERS_CHARACTERS`
+- `STICKERS_ANIMALS`
+- `STICKERS_FASHION`
+- `STICKERS_ART`
+- `STICKERS_GAMING`
+- `STICKERS_KIDS_AND_FAMILY`
+- `STICKERS_PEOPLE`
+- `STICKERS_MUSIC`
 
 ### Available age rating groups
 
@@ -602,26 +587,30 @@ You can always prefix the category using `MZGenre.` (e.g. `MZGenre.Book`). _deli
 - 1: Infrequent/Mild
 - 2: Frequent/Intense
 
+- `NONE`
+- `INFREQUENT_OR_MILD`
+- `FREQUENT_OR_INTENSE`
+
 **Keys**
 
-- `CARTOON_FANTASY_VIOLENCE`
-- `REALISTIC_VIOLENCE`
-- `PROLONGED_GRAPHIC_SADISTIC_REALISTIC_VIOLENCE`
-- `PROFANITY_CRUDE_HUMOR`
-- `MATURE_SUGGESTIVE`
-- `HORROR`
-- `MEDICAL_TREATMENT_INFO`
-- `ALCOHOL_TOBACCO_DRUGS`
-- `GAMBLING`
-- `SEXUAL_CONTENT_NUDITY`
-- `GRAPHIC_SEXUAL_CONTENT_NUDITY`
+- `violenceCartoonOrFantasy`
+- `violenceRealistic`
+- `violenceRealisticProlongedGraphicOrSadistic`
+- `profanityOrCrudeHumor`
+- `matureOrSuggestiveThemes`
+- `horrorOrFearThemes`
+- `medicalOrTreatmentInformation`
+- `alcoholTobaccoOrDrugUseOrReferences`
+- `gamblingSimulated`
+- `sexualContentOrNudity`
+- `sexualContentGraphicAndNudity`
 
 #### Boolean
 
 **Keys**
 
-- `UNRESTRICTED_WEB_ACCESS`
-- `GAMBLING_CONTESTS`
+- `unrestrictedWebAccess`
+- `gamblingAndContests`
 </details>
 
 <br />