fastlane 2.173.0 → 2.194.0

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -17,9 +17,11 @@ module Spaceship
         # ageRatingDeclarations
         #
 
-        def get_age_rating_declaration(app_store_version_id: nil)
+        def get_age_rating_declaration(app_info_id: nil, app_store_version_id: nil)
+          raise "Keyword 'app_store_version_id' is deprecated and 'app_info_id' is required" if app_store_version_id || app_info_id.nil?
+
           params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/ageRatingDeclaration", params)
+          tunes_request_client.get("appInfos/#{app_info_id}/ageRatingDeclaration", params)
         end
 
         def patch_age_rating_declaration(age_rating_declaration_id: nil, attributes: nil)
@@ -381,6 +383,11 @@ module Spaceship
           tunes_request_client.post("appPreviewSets", body)
         end
 
+        def delete_app_preview_set(app_preview_set_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appPreviewSets/#{app_preview_set_id}", params)
+        end
+
         def patch_app_preview_set_previews(app_preview_set_id: nil, app_preview_ids: nil)
           app_preview_ids ||= []
 
@@ -515,6 +522,11 @@ module Spaceship
           tunes_request_client.patch("appScreenshotSets/#{app_screenshot_set_id}/relationships/appScreenshots", body)
         end
 
+        def delete_app_screenshot_set(app_screenshot_set_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appScreenshotSets/#{app_screenshot_set_id}", params)
+        end
+
         #
         # appScreenshots
         #
@@ -757,6 +769,11 @@ module Spaceship
           tunes_request_client.get("appStoreVersions/#{app_store_version_id}/appStoreVersionLocalizations", params)
         end
 
+        def get_app_store_version_localization(app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersionLocalizations/#{app_store_version_localization_id}", params)
+        end
+
         def post_app_store_version_localization(app_store_version_id: nil, attributes: {})
           body = {
             data: {

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

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::Users::API)
           self.users_request_client = self
         end

data/spaceship/lib/spaceship/connect_api/users/users.rb

@@ -28,8 +28,13 @@ module Spaceship
           users_request_client.delete("users/#{user_id}")
         end
 
-        # Change app permissions for user
+        # Add app permissions for user
+        # @deprecated Use {#post_user_visible_apps} instead.
         def add_user_visible_apps(user_id: nil, app_ids: nil)
+          post_user_visible_apps(user_id: user_id, app_ids: app_ids)
+        end
+
+        def post_user_visible_apps(user_id: nil, app_ids: nil)
           body = {
             data: app_ids.map do |app_id|
               {
@@ -42,18 +47,52 @@ module Spaceship
           users_request_client.post("users/#{user_id}/relationships/visibleApps", body)
         end
 
+        # Replace app permissions for user
+        def patch_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+
+          users_request_client.patch("users/#{user_id}/relationships/visibleApps", body)
+        end
+
+        # Remove app permissions for user
+        def delete_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+          params = nil
+          users_request_client.delete("users/#{user_id}/relationships/visibleApps", params, body)
+        end
+
+        # Get app permissions for user
+        def get_user_visible_apps(user_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("users/#{user_id}/visibleApps", params)
+        end
+
         #
         # invitations (invited users)
         #
 
-        # Get all invited users (not yet accepted)
+        # Get all invited users
         def get_user_invitations(filter: {}, includes: nil, limit: nil, sort: nil)
           params = users_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
           users_request_client.get("userInvitations", params)
         end
 
         # Invite new users to App Store Connect
-        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil)
+        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil, visible_app_ids: [])
           body = {
             data: {
               type: "userInvitations",
@@ -64,6 +103,16 @@ module Spaceship
                 roles: roles,
                 provisioningAllowed: provisioning_allowed,
                 allAppsVisible: all_apps_visible
+              },
+              relationships: {
+                visibleApps: {
+                  data: visible_app_ids.map do |id|
+                    {
+                      id: id,
+                      type: "apps"
+                    }
+                  end
+                }
               }
             }
           }
@@ -74,6 +123,12 @@ module Spaceship
         def delete_user_invitation(user_invitation_id: nil)
           users_request_client.delete("userInvitations/#{user_invitation_id}")
         end
+
+        # Get all app permissions for invited user
+        def get_user_invitation_visible_apps(user_invitation_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("userInvitations/#{user_invitation_id}/visibleApps", params)
+        end
       end
     end
   end

data/spaceship/lib/spaceship/connect_api.rb

@@ -10,6 +10,7 @@ require 'spaceship/connect_api/tunes/tunes'
 
 require 'spaceship/connect_api/models/bundle_id_capability'
 require 'spaceship/connect_api/models/bundle_id'
+require 'spaceship/connect_api/models/capabilities'
 require 'spaceship/connect_api/models/certificate'
 require 'spaceship/connect_api/models/device'
 require 'spaceship/connect_api/models/profile'

data/spaceship/lib/spaceship/playground.rb

@@ -13,8 +13,8 @@ module Spaceship
       rescue Gem::LoadError
         puts("Could not find gem 'pry'".red)
         puts("")
-        puts("If you installed spaceship using `sudo gem install spaceship` run")
-        puts("  sudo gem install pry".yellow)
+        puts("If you installed spaceship using `gem install spaceship` run")
+        puts("  gem install pry".yellow)
         puts("to install the missing gem")
         puts("")
         puts("If you use a Gemfile add this to your Gemfile:")

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -1,15 +1,17 @@
 require 'colored'
 require 'credentials_manager/appfile_config'
 require 'yaml'
+require 'fastlane_core'
 
 require_relative 'tunes/tunes_client'
 
 module Spaceship
   class SpaceauthRunner
-    def initialize(username: nil)
+    def initialize(username: nil, copy_to_clipboard: nil)
       @username = username
       @username ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
       @username ||= ask("Username: ")
+      @copy_to_clipboard = copy_to_clipboard
     end
 
     def run
@@ -22,7 +24,7 @@ module Spaceship
         puts("Could not login to App Store Connect".red)
         puts("Please check your credentials and try again.".yellow)
         puts("This could be an issue with App Store Connect,".yellow)
-        puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
+        puts("Please try unsetting the FASTLANE_SESSION environment variable by calling 'unset FASTLANE_SESSION'".yellow)
         puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
         puts("")
         puts("Exception type: #{ex.class}")
@@ -37,34 +39,55 @@ module Spaceship
       # Example:
       # name: DES5c148586daa451e55afb017aa62418f91
       # value: HSARMTKNSRVTWFlaF/ek8asaa9lymMA0dN8JQ6pY7B3F5kdqTxJvMT19EVEFX8EQudB/uNwBHOHzaa30KYTU/eCP/UF7vGTgxs6PAnlVWKscWssOVHfP2IKWUPaa4Dn+I6ilA7eAFQsiaaVT
-      cookies = YAML.safe_load(
-        itc_cookie_content,
-        [HTTP::Cookie, Time], # classes allowlist
-        [],                   # symbols allowlist
-        true                  # allow YAML aliases
-      )
+      cookies = load_cookies(itc_cookie_content)
 
       # We remove all the un-needed cookies
       cookies.select! do |cookie|
         cookie.name.start_with?("myacinfo") || cookie.name == "dqsid" || cookie.name.start_with?("DES")
       end
 
-      yaml = cookies.to_yaml.gsub("\n", "\\n")
+      @yaml = cookies.to_yaml.gsub("\n", "\\n")
 
       puts("---")
       puts("")
       puts("Pass the following via the FASTLANE_SESSION environment variable:")
-      puts(yaml.cyan.underline)
+      puts(@yaml.cyan.underline)
       puts("")
       puts("")
       puts("Example:")
-      puts("export FASTLANE_SESSION='#{yaml}'".cyan.underline)
+      puts("export FASTLANE_SESSION='#{@yaml}'".cyan.underline)
 
-      if mac? && Spaceship::Client::UserInterface.interactive? && agree("🙄 Should fastlane copy the cookie into your clipboard, so you can easily paste it? (y/n)", true)
-        require 'open3'
-        Open3.popen3('pbcopy') { |input, _, _| input << yaml }
-        puts("Successfully copied text into your clipboard 🎨".green)
+      if @copy_to_clipboard == false
+        puts("Skipped asking to copy the session string into your clipboard ⏭️".green)
+      elsif @copy_to_clipboard || (mac? && Spaceship::Client::UserInterface.interactive? && agree("🙄 Should fastlane copy the cookie into your clipboard, so you can easily paste it? (y/n)", true))
+        FastlaneCore::Clipboard.copy(content: @yaml)
+        puts("Successfully copied the session string into your clipboard 🎨".green)
       end
+
+      return self
+    end
+
+    def load_cookies(content)
+      # When Ruby 2.5 support is dropped, we can safely get rid of the latter branch.
+      if YAML.name == 'Psych' && Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1')
+        YAML.safe_load(
+          content,
+          permitted_classes: [HTTP::Cookie, Time],
+          aliases: true
+        )
+      else
+        YAML.safe_load(
+          content,
+          [HTTP::Cookie, Time], # classes allowlist
+          [],                   # symbols allowlist
+          true                  # allow YAML aliases
+        )
+      end
+    end
+
+    def session_string
+      FastlaneCore::UI.user_error!("`#{__method__}` method called before calling `run` in `SpaceauthRunner`") unless @yaml
+      @yaml
     end
 
     def mac?

data/spaceship/lib/spaceship/tunes/members.rb

@@ -15,7 +15,7 @@ module Spaceship
 
         def find(email)
           all.each do |member|
-            if member.email_address == email
+            if member.email_address.casecmp?(email)
               return member
             end
           end

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

@@ -24,6 +24,9 @@ module Spaceship
       super
 
       @du_client = DUClient.new
+
+      # Used by most WebObjects requests starting in July 2021
+      @additional_headers = { 'x-csrf-itc': 'itc' }
     end
 
     class << self
@@ -579,10 +582,10 @@ module Spaceship
       }
 
       r = request(:post) do |req|
-        req.url("https://analytics.itunes.apple.com/analytics/api/v1/data/time-series")
+        req.url("https://appstoreconnect.apple.com/analytics/api/v1/data/time-series")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Requested-By'] = 'analytics.itunes.apple.com'
+        req.headers['X-Requested-By'] = 'appstoreconnect.apple.com'
       end
 
       data = parse_response(r)

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -4,7 +4,7 @@ require_relative 'tunes/tunes_client'
 module Spaceship
   class Client
     def handle_two_step_or_factor(response)
-      raise "2FA can only be performed in interactive mode" if ENV["FASTLANE_IS_INTERACTIVE"] == "false"
+      raise "2FA can only be performed in interactive mode" if ENV["SPACESHIP_ONLY_ALLOW_INTERACTIVE_2FA"] == "true" && ENV["FASTLANE_IS_INTERACTIVE"] == "false"
       # extract `x-apple-id-session-id` and `scnt` from response, to be used by `update_request_headers`
       @x_apple_id_session_id = response["x-apple-id-session-id"]
       @scnt = response["scnt"]
@@ -135,7 +135,7 @@ module Spaceship
 
         phone_number = env_2fa_sms_default_phone_number
         phone_id = phone_id_from_number(response.body["trustedPhoneNumbers"], phone_number)
-        push_mode = push_mode_from_masked_number(response.body["trustedPhoneNumbers"], phone_number)
+        push_mode = push_mode_from_number(response.body["trustedPhoneNumbers"], phone_number)
         # don't request sms if no trusted devices and env default is the only trusted number,
         # code was automatically sent
         should_request_code = !sms_automatically_sent(response)
@@ -234,34 +234,8 @@ module Spaceship
     end
 
     def phone_id_from_number(phone_numbers, phone_number)
-      characters_to_remove_from_phone_numbers = ' \-()"'
-
-      # start with e.g. +49 162 1234585 or +1-123-456-7866
-      phone_number = phone_number.tr(characters_to_remove_from_phone_numbers, '')
-      # cleaned: +491621234585 or +11234567866
-
       phone_numbers.each do |phone|
-        # rubocop:disable Style/AsciiComments
-        # start with: +49 •••• •••••85 or +1 (•••) •••-••66
-        number_with_dialcode_masked = phone['numberWithDialCode'].tr(characters_to_remove_from_phone_numbers, '')
-        # cleaned: +49•••••••••85 or +1••••••••66
-        # rubocop:enable Style/AsciiComments
-
-        maskings_count = number_with_dialcode_masked.count('•') # => 9 or 8
-        pattern = /^([0-9+]{2,4})([•]{#{maskings_count}})([0-9]{2})$/
-        # following regex: range from maskings_count-2 because sometimes the masked number has 1 or 2 dots more than the actual number
-        # e.g. https://github.com/fastlane/fastlane/issues/14969
-        replacement = "\\1([0-9]{#{maskings_count - 2},#{maskings_count}})\\3"
-        number_with_dialcode_regex_part = number_with_dialcode_masked.gsub(pattern, replacement)
-        # => +49([0-9]{8,9})85 or +1([0-9]{7,8})66
-
-        backslash = '\\'
-        number_with_dialcode_regex_part = backslash + number_with_dialcode_regex_part
-        number_with_dialcode_regex = /^#{number_with_dialcode_regex_part}$/
-        # => /^\+49([0-9]{8})85$/ or /^\+1([0-9]{7,8})66$/
-
-        return phone['id'] if phone_number =~ number_with_dialcode_regex
-        # +491621234585 matches /^\+49([0-9]{8})85$/
+        return phone['id'] if match_phone_to_masked_phone(phone_number, phone['numberWithDialCode'])
       end
 
       # Handle case of phone_number not existing in phone_numbers because ENV var is wrong or matcher is broken
@@ -272,6 +246,45 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
 )
     end
 
+    def push_mode_from_number(phone_numbers, phone_number)
+      phone_numbers.each do |phone|
+        return phone['pushMode'] if match_phone_to_masked_phone(phone_number, phone['numberWithDialCode'])
+      end
+
+      # If no pushMode was supplied, assume sms
+      return "sms"
+    end
+
+    def match_phone_to_masked_phone(phone_number, masked_number)
+      characters_to_remove_from_phone_numbers = ' \-()"'
+
+      # start with e.g. +49 162 1234585 or +1-123-456-7866
+      phone_number = phone_number.tr(characters_to_remove_from_phone_numbers, '')
+      # cleaned: +491621234585 or +11234567866
+
+      # rubocop:disable Style/AsciiComments
+      # start with: +49 •••• •••••85 or +1 (•••) •••-••66
+      number_with_dialcode_masked = masked_number.tr(characters_to_remove_from_phone_numbers, '')
+      # cleaned: +49•••••••••85 or +1••••••••66
+      # rubocop:enable Style/AsciiComments
+
+      maskings_count = number_with_dialcode_masked.count('•') # => 9 or 8
+      pattern = /^([0-9+]{2,4})([•]{#{maskings_count}})([0-9]{2})$/
+      # following regex: range from maskings_count-2 because sometimes the masked number has 1 or 2 dots more than the actual number
+      # e.g. https://github.com/fastlane/fastlane/issues/14969
+      replacement = "\\1([0-9]{#{maskings_count - 2},#{maskings_count}})\\3"
+      number_with_dialcode_regex_part = number_with_dialcode_masked.gsub(pattern, replacement)
+      # => +49([0-9]{8,9})85 or +1([0-9]{7,8})66
+
+      backslash = '\\'
+      number_with_dialcode_regex_part = backslash + number_with_dialcode_regex_part
+      number_with_dialcode_regex = /^#{number_with_dialcode_regex_part}$/
+      # => /^\+49([0-9]{8})85$/ or /^\+1([0-9]{7,8})66$/
+
+      return phone_number =~ number_with_dialcode_regex
+      # +491621234585 matches /^\+49([0-9]{8})85$/
+    end
+
     def phone_id_from_masked_number(phone_numbers, masked_number)
       phone_numbers.each do |phone|
         return phone['id'] if phone['numberWithDialCode'] == masked_number

data/spaceship/lib/spaceship/ui.rb

@@ -18,10 +18,10 @@ module Spaceship
     end
 
     # Public getter for all UI related code
-    # rubocop:disable Style/MethodName
+    # rubocop:disable Naming/MethodName
     def UI
       UserInterface.new(self)
     end
-    # rubocop:enable Style/MethodName
+    # rubocop:enable Naming/MethodName
   end
 end

data/supply/lib/supply/client.rb

@@ -162,7 +162,46 @@ module Supply
     def commit_current_edit!
       ensure_active_edit!
 
-      call_google_api { client.commit_edit(current_package_name, current_edit.id) }
+      call_google_api do
+        begin
+          client.commit_edit(
+            current_package_name,
+            current_edit.id,
+            changes_not_sent_for_review: Supply.config[:changes_not_sent_for_review]
+          )
+        rescue Google::Apis::ClientError => e
+          unless Supply.config[:rescue_changes_not_sent_for_review]
+            raise
+          end
+
+          error = begin
+                    JSON.parse(e.body)
+                  rescue
+                    nil
+                  end
+
+          if error
+            message = error["error"] && error["error"]["message"]
+          else
+            message = e.body
+          end
+
+          if message.include?("The query parameter changesNotSentForReview must not be set")
+            client.commit_edit(
+              current_package_name,
+              current_edit.id
+            )
+          elsif message.include?("Please set the query parameter changesNotSentForReview to true")
+            client.commit_edit(
+              current_package_name,
+              current_edit.id,
+              changes_not_sent_for_review: true
+            )
+          else
+            raise
+          end
+        end
+      end
 
       self.current_edit = nil
       self.current_package_name = nil
@@ -279,13 +318,13 @@ module Supply
     def update_listing_for_language(language: nil, title: nil, short_description: nil, full_description: nil, video: nil)
       ensure_active_edit!
 
-      listing = AndroidPublisher::Listing.new({
+      listing = AndroidPublisher::Listing.new(
         language: language,
         title: title,
         full_description: full_description,
         short_description: short_description,
         video: video
-      })
+      )
 
       call_google_api do
         client.update_edit_listing(
@@ -327,12 +366,14 @@ module Supply
     def upload_mapping(path_to_mapping, apk_version_code)
       ensure_active_edit!
 
+      extension = File.extname(path_to_mapping).downcase
+
       call_google_api do
         client.upload_edit_deobfuscationfile(
           current_package_name,
           current_edit.id,
           apk_version_code,
-          "proguard",
+          extension == ".zip" ? "nativeCode" : "proguard",
           upload_source: path_to_mapping,
           content_type: "application/octet-stream"
         )

data/supply/lib/supply/commands_generator.rb

@@ -1,5 +1,6 @@
 require "commander"
 require "fastlane_core"
+require 'fastlane_core/ui/help_formatter'
 require "supply"
 
 HighLine.track_eof = false
@@ -19,7 +20,7 @@ module Supply
       program :help, 'Author', 'Felix Krause <supply@krausefx.com>'
       program :help, 'Website', 'https://fastlane.tools'
       program :help, 'Documentation', 'https://docs.fastlane.tools/actions/supply/'
-      program :help_formatter, :compact
+      program :help_formatter, FastlaneCore::HelpFormatter
 
       always_trace!
 

data/supply/lib/supply/options.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/ClassLength
+
 require 'fastlane_core/configuration/config_item'
 require 'credentials_manager/appfile_config'
 
@@ -223,7 +225,7 @@ module Supply
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :mapping,
                                      env_name: "SUPPLY_MAPPING",
-                                     description: "Path to the mapping file to upload",
+                                     description: "Path to the mapping file to upload (mapping.txt or native-debug-symbols.zip alike)",
                                      short_option: "-d",
                                      conflicting_options: [:mapping_paths],
                                      optional: true,
@@ -235,7 +237,7 @@ module Supply
                                      conflicting_options: [:mapping],
                                      optional: true,
                                      type: Array,
-                                     description: "An array of paths to mapping files to upload",
+                                     description: "An array of paths to mapping files to upload (mapping.txt or native-debug-symbols.zip alike)",
                                      short_option: "-s",
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
@@ -281,6 +283,16 @@ module Supply
                                          UI.user_error!("Version code '#{version_code}' is not an integer") if version_code == 0
                                        end
                                      end),
+        FastlaneCore::ConfigItem.new(key: :changes_not_sent_for_review,
+                                     env_name: "SUPPLY_CHANGES_NOT_SENT_FOR_REVIEW",
+                                     description: "Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Google Play Console UI",
+                                     type: Boolean,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :rescue_changes_not_sent_for_review,
+                                     env_name: "SUPPLY_RESCUE_CHANGES_NOT_SENT_FOR_REVIEW",
+                                     description: "Catches changes_not_sent_for_review errors when an edit is committed and retries with the configuration that the error message recommended",
+                                     type: Boolean,
+                                     default_value: true),
         FastlaneCore::ConfigItem.new(key: :in_app_update_priority,
                                      env_name: "SUPPLY_IN_APP_UPDATE_PRIORITY",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -13,6 +13,8 @@ module Supply
       apk_version_codes.concat(upload_bundles) unless Supply.config[:skip_upload_aab]
       upload_mapping(apk_version_codes)
 
+      track_to_update = Supply.config[:track]
+
       apk_version_codes.concat(Supply.config[:version_codes_to_retain]) if Supply.config[:version_codes_to_retain]
 
       if !apk_version_codes.empty?
@@ -23,13 +25,14 @@ module Supply
       else
         # Only promote or rollout if we don't have version codes
         if Supply.config[:track_promote_to]
+          track_to_update = Supply.config[:track_promote_to]
           promote_track
         elsif !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
           update_rollout
         end
       end
 
-      perform_upload_meta(apk_version_codes)
+      perform_upload_meta(apk_version_codes, track_to_update)
 
       if Supply.config[:validate_only]
         UI.message("Validating all changes with Google Play...")
@@ -70,7 +73,7 @@ module Supply
       end
     end
 
-    def perform_upload_meta(version_codes)
+    def perform_upload_meta(version_codes, track_name)
       if (!Supply.config[:skip_upload_metadata] || !Supply.config[:skip_upload_images] || !Supply.config[:skip_upload_changelogs] || !Supply.config[:skip_upload_screenshots]) && metadata_path
         # Use version code from config if version codes is empty and no nil or empty string
         version_codes = [Supply.config[:version_code]] if version_codes.empty?
@@ -81,7 +84,7 @@ module Supply
         version_codes.each do |version_code|
           UI.user_error!("Could not find folder #{metadata_path}") unless File.directory?(metadata_path)
 
-          track, release = fetch_track_and_release!(Supply.config[:track], version_code)
+          track, release = fetch_track_and_release!(track_name, version_code)
           UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
           UI.user_error!("Could not find release for version code '#{version_code}' to update changelog") unless release
 
@@ -98,7 +101,7 @@ module Supply
             release_notes << upload_changelog(language, version_code) unless Supply.config[:skip_upload_changelogs]
           end
 
-          upload_changelogs(release_notes, release, track) unless release_notes.empty?
+          upload_changelogs(release_notes, release, track, track_name) unless release_notes.empty?
         end
       end
     end
@@ -233,15 +236,15 @@ module Supply
         end
       end
 
-      AndroidPublisher::LocalizedText.new({
+      AndroidPublisher::LocalizedText.new(
         language: language,
         text: changelog_text
-      })
+      )
     end
 
-    def upload_changelogs(release_notes, release, track)
+    def upload_changelogs(release_notes, release, track, track_name)
       release.release_notes = release_notes
-      client.upload_changelogs(track, Supply.config[:track])
+      client.upload_changelogs(track, track_name)
     end
 
     def upload_metadata(language, listing)
@@ -302,8 +305,9 @@ module Supply
 
     def upload_mapping(apk_version_codes)
       mapping_paths = [Supply.config[:mapping]] unless (mapping_paths = Supply.config[:mapping_paths])
-      mapping_paths.zip(apk_version_codes).each do |mapping_path, version_code|
+      mapping_paths.product(apk_version_codes).each do |mapping_path, version_code|
         if mapping_path
+          UI.message("Preparing mapping at path '#{mapping_path}', version code #{version_code} for upload...")
           client.upload_mapping(mapping_path, version_code)
         end
       end