fastlane 2.150.0.rc1 → 2.150.0.rc6

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

@@ -1,4 +1,5 @@
 require 'spaceship/tunes/tunes'
+require 'digest/md5'
 
 require_relative 'app_screenshot'
 require_relative 'module'
@@ -34,13 +35,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
 
@@ -65,6 +92,16 @@ module Deliver
         localizations = version.get_app_store_version_localizations
       end
 
+      upload_screenshots(screenshots_per_language, localizations)
+    end
+
+    def upload_screenshots(screenshots_per_language, localizations)
+      # Check if should wait for processing
+      wait_for_processing = !FastlaneCore::Env.truthy?("DELIVER_SKIP_WAIT_FOR_SCREENSHOT_PROCESSING")
+      if wait_for_processing
+        UI.important("Set environment variable DELIVER_SKIP_WAIT_FOR_SCREENSHOT_PROCESSING=true to skip waiting for screenshots to process")
+      end
+
       # Upload screenshots
       indized = {} # per language and device type
 
@@ -88,7 +125,13 @@ module Deliver
           app_screenshot_sets_map[app_screenshot_set.screenshot_display_type] = app_screenshot_set
 
           # Set initial screnshot count
-          indized[localization.locale][app_screenshot_set.screenshot_display_type] ||= app_screenshot_set.app_screenshots.size
+          indized[localization.locale][app_screenshot_set.screenshot_display_type] ||= {
+            count: app_screenshot_set.app_screenshots.size,
+            checksums: []
+          }
+
+          checksums = app_screenshot_set.app_screenshots.map(&:source_file_checksum).uniq
+          indized[localization.locale][app_screenshot_set.screenshot_display_type][:checksums] = checksums
         end
 
         UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
@@ -107,21 +150,30 @@ module Deliver
             })
             app_screenshot_sets_map[display_type] = set
 
-            indized[localization.locale][set.screenshot_display_type] = 0
+            indized[localization.locale][set.screenshot_display_type] = {
+              count: 0,
+              checksums: []
+            }
           end
 
-          index = indized[localization.locale][set.screenshot_display_type]
+          index = indized[localization.locale][set.screenshot_display_type][:count]
 
           if index >= 10
-            UI.error("Too many screenshots found for device '#{screenshot.formatted_name}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
+            UI.error("Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
             next
           end
 
-          indized[localization.locale][set.screenshot_display_type] += 1
+          bytes = File.binread(screenshot.path)
+          checksum = Digest::MD5.hexdigest(bytes)
+          duplicate = indized[localization.locale][set.screenshot_display_type][:checksums].include?(checksum)
 
-          # Also.. what is the messages type even for?
-          UI.message("Uploading '#{screenshot.path}'...")
-          set.upload_screenshot(path: screenshot.path)
+          if duplicate
+            UI.message("Previous uploaded. Skipping '#{screenshot.path}'...")
+          else
+            indized[localization.locale][set.screenshot_display_type][:count] += 1
+            UI.message("Uploading '#{screenshot.path}'...")
+            set.upload_screenshot(path: screenshot.path, wait_for_processing: wait_for_processing)
+          end
         end
       end
       UI.success("Successfully uploaded screenshots to App Store Connect")

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

@@ -435,6 +435,10 @@ Omit `build_number` to let _fastlane_ automatically select the latest build numb
 
 Use the `submission_information` parameter for additional submission specifiers, including compliance and IDFA settings. Look at the Spaceship's [`app_submission.rb`](https://github.com/fastlane/fastlane/blob/master/spaceship/lib/spaceship/tunes/app_submission.rb) file for options. See [this example](https://github.com/artsy/eigen/blob/faa02e2746194d8d7c11899474de9c517435eca4/fastlane/Fastfile#L131-L149).
 
+```no-highlight
+fastlane deliver submit_build --build_number 830 --submission_information "{\"export_compliance_uses_encryption\": false, \"add_id_info_uses_idfa\": false }"
+```
+
 # Credentials
 
 A detailed description about how your credentials are handled is available in a [credentials_manager](https://github.com/fastlane/fastlane/tree/master/credentials_manager).
@@ -494,33 +498,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 +546,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 +591,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 />

data/fastlane/lib/fastlane/actions/set_changelog.rb

@@ -9,16 +9,18 @@ module Fastlane
         Spaceship::Tunes.select_team
         UI.message("Login successful")
 
-        app = Spaceship::Application.find(params[:app_identifier]) || Spaceship::Application.find(params[:app_identifier], mac: true)
+        app = Spaceship::ConnectAPI::App.find(params[:app_identifier])
         UI.user_error!("Couldn't find app with identifier #{params[:app_identifier]}") if app.nil?
 
         version_number = params[:version]
-        platform = params[:platform]
+        platform = Spaceship::ConnectAPI::Platform.map(params[:platform])
+
         unless version_number
           # Automatically fetch the latest version
           UI.message("Fetching the latest version for this app")
-          if app.edit_version(platform: platform) && app.edit_version(platform: platform).version
-            version_number = app.edit_version(platform: platform).version
+          edit_version = app.get_edit_app_store_version(platform: platform)
+          if edit_version
+            version_number = edit_version.version_string
           else
             UI.message("You have to specify a new version number: ")
             version_number = STDIN.gets.strip
@@ -42,31 +44,32 @@ module Fastlane
 
         UI.important("Going to update the changelog to:\n\n#{changelog}\n\n")
 
-        if (v = app.edit_version(platform: platform))
-          if v.version != version_number
+        edit_version = app.get_edit_app_store_version(platform: platform)
+        if edit_version
+          if edit_version.version_string != version_number
             # Version is already there, make sure it matches the one we want to create
-            UI.message("Changing existing version number from '#{v.version}' to '#{version_number}'")
-            v.version = version_number
-            v.save!
+            UI.message("Changing existing version number from '#{edit_version.version_string}' to '#{version_number}'")
+            edit_version = edit_version.update(attributes: {
+              versionString: version_number
+            })
           else
-            UI.message("Updating changelog for existing version #{v.version}")
+            UI.message("Updating changelog for existing version #{edit_version.version_string}")
           end
         else
           UI.message("Creating the new version: #{version_number}")
-          app.create_version!(version_number)
-          app = Spaceship::Application.find(params[:app_identifier]) # Replace with .reload method once available
-          v = app.edit_version(platform: platform)
+          attributes = { versionString: version_number, platform: platform }
+          edit_version = Spaceship::ConnectAPI.post_app_store_version(app_id: app.id, attributes: attributes).first
         end
 
-        v.release_notes.languages.each do |lang|
-          v.release_notes[lang] = changelog
+        localizations = edit_version.get_app_store_version_localizations
+        localizations.each do |localization|
+          UI.message("Updating changelog for the '#{localization.locale}'")
+          localization.update(attributes: {
+            whatsNew: changelog
+          })
         end
 
-        UI.message("Found and updated changelog for the following languages: #{v.release_notes.languages.join(', ')}")
-        UI.message("Uploading changes to App Store Connect...")
-        v.save!
-
-        UI.success("👼  Successfully pushed the new changelog to #{v.url}")
+        UI.success("👼  Successfully pushed the new changelog to for #{edit_version.version_string}")
       end
 
       def self.default_changelog_path

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.150.0.rc1'.freeze
+  VERSION = '2.150.0.rc6'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -6,7 +6,7 @@ module FastlaneCore
   class BuildWatcher
     class << self
       # @return The build we waited for. This method will always return a build
-      def wait_for_build_processing_to_be_complete(app_id: nil, platform: nil, train_version: nil, app_version: nil, build_version: nil, poll_interval: 10, strict_build_watch: false, return_when_build_appears: false, return_spaceship_testflight_build: true)
+      def wait_for_build_processing_to_be_complete(app_id: nil, platform: nil, train_version: nil, app_version: nil, build_version: nil, poll_interval: 10, strict_build_watch: false, return_when_build_appears: false, return_spaceship_testflight_build: true, select_latest: false)
         # Warn about train_version being removed in the future
         if train_version
           UI.deprecated(":train_version is no longer a used argument on FastlaneCore::BuildWatcher. Please use :app_version instead.")
@@ -23,7 +23,7 @@ module FastlaneCore
 
         showed_info = false
         loop do
-          matched_build = matching_build(watched_app_version: app_version, watched_build_version: build_version, app_id: app_id, platform: platform)
+          matched_build = matching_build(watched_app_version: app_version, watched_build_version: build_version, app_id: app_id, platform: platform, select_latest: select_latest)
 
           if matched_build.nil? && !showed_info
             UI.important("Read more information on why this build isn't showing up yet - https://github.com/fastlane/fastlane/issues/14997")
@@ -55,7 +55,7 @@ module FastlaneCore
         return version.instance_of?(String) ? version.split('.').map { |s| s.to_i.to_s }.join('.') : version
       end
 
-      def matching_build(watched_app_version: nil, watched_build_version: nil, app_id: nil, platform: nil)
+      def matching_build(watched_app_version: nil, watched_build_version: nil, app_id: nil, platform: nil, select_latest: false)
         # Get build deliveries (newly uploaded processing builds)
         watched_app_version = remove_version_leading_zeros(version: watched_app_version)
         watched_build_version = remove_version_leading_zeros(version: watched_build_version)
@@ -69,7 +69,7 @@ module FastlaneCore
 
         # Raise error if more than 1 build is returned
         # This should never happen but need to inform the user if it does
-        if matched_builds.size > 1
+        if matched_builds.size > 1 && !select_latest
           error_builds = matched_builds.map do |build|
             "#{build.app_version}(#{build.version}) for #{build.platform} - #{build.processing_state}"
           end.join("\n")