fastlane 2.132.0 → 2.135.2

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.132.0
+// Generated with fastlane 2.135.2

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -1,22 +1,60 @@
 protocol ScreengrabfileProtocol: class {
+
+  /// Path to the root of your Android SDK installation, e.g. ~/tools/android-sdk-macosx
   var androidHome: String? { get }
+
+  /// The Android build tools version to use, e.g. '23.0.2'
   var buildToolsVersion: String? { get }
+
+  /// A list of locales which should be used
   var locales: [String] { get }
+
+  /// Enabling this option will automatically clear previously generated screenshots before running screengrab
   var clearPreviousScreenshots: Bool { get }
+
+  /// The directory where to store the screenshots
   var outputDirectory: String { get }
+
+  /// Don't open the summary after running _screengrab_
   var skipOpenSummary: Bool { get }
+
+  /// The package name of the app under test (e.g. com.yourcompany.yourapp)
   var appPackageName: String { get }
+
+  /// The package name of the tests bundle (e.g. com.yourcompany.yourapp.test)
   var testsPackageName: String? { get }
+
+  /// Only run tests in these Java packages
   var useTestsInPackages: [String]? { get }
+
+  /// Only run tests in these Java classes
   var useTestsInClasses: [String]? { get }
+
+  /// Additional launch arguments
   var launchArguments: [String]? { get }
+
+  /// The fully qualified class name of your test instrumentation runner
   var testInstrumentationRunner: String { get }
+
+  /// Return the device to this locale after running tests
   var endingLocale: String { get }
+
+  /// The path to the APK for the app under test
   var appApkPath: String? { get }
+
+  /// The path to the APK for the the tests bundle
   var testsApkPath: String? { get }
+
+  /// Use the device or emulator with the given serial number or qualifier
   var specificDevice: String? { get }
+
+  /// Type of device used for screenshots. Matches Google Play Types (phone, sevenInch, tenInch, tv, wear)
   var deviceType: String { get }
+
+  /// Whether or not to exit Screengrab on test failure. Exiting on failure will not copy sceenshots to local machine nor open sceenshots summary
   var exitOnTestFailure: Bool { get }
+
+  /// Enabling this option will automatically uninstall the application before running it
   var reinstallApp: Bool { get }
 }
 
@@ -42,7 +80,6 @@ extension ScreengrabfileProtocol {
   var reinstallApp: Bool { return false }
 }
 
-
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.1]
+// FastlaneRunnerAPIVersion [0.9.11]

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.132.0
+// Generated with fastlane 2.135.2

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -1,37 +1,105 @@
 protocol SnapshotfileProtocol: class {
+
+  /// Path the workspace file
   var workspace: String? { get }
+
+  /// Path the project file
   var project: String? { get }
+
+  /// Pass additional arguments to xcodebuild for the test phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS="-ObjC -lstdc++"
   var xcargs: String? { get }
+
+  /// Use an extra XCCONFIG file to build your app
   var xcconfig: String? { get }
+
+  /// A list of devices you want to take the screenshots from
   var devices: [String]? { get }
+
+  /// A list of languages which should be used
   var languages: [String] { get }
+
+  /// A list of launch arguments which should be used
   var launchArguments: [String] { get }
+
+  /// The directory where to store the screenshots
   var outputDirectory: String { get }
+
+  /// If the logs generated by the app (e.g. using NSLog, perror, etc.) in the Simulator should be written to the output_directory
   var outputSimulatorLogs: Bool { get }
+
+  /// By default, the latest version should be used automatically. If you want to change it, do it here
   var iosVersion: String? { get }
+
+  /// Don't open the HTML summary after running _snapshot_
   var skipOpenSummary: Bool { get }
+
+  /// Do not check for most recent SnapshotHelper code
   var skipHelperVersionCheck: Bool { get }
+
+  /// Enabling this option will automatically clear previously generated screenshots before running snapshot
   var clearPreviousScreenshots: Bool { get }
+
+  /// Enabling this option will automatically uninstall the application before running it
   var reinstallApp: Bool { get }
+
+  /// Enabling this option will automatically erase the simulator before running the application
   var eraseSimulator: Bool { get }
+
+  /// Enabling this option will configure the Simulator's system language
   var localizeSimulator: Bool { get }
+
+  /// Enabling this option will configure the Simulator to be in dark mode (false for light, true for dark)
   var darkMode: Bool? { get }
+
+  /// The bundle identifier of the app to uninstall (only needed when enabling reinstall_app)
   var appIdentifier: String? { get }
+
+  /// A list of photos that should be added to the simulator before running the application
   var addPhotos: [String]? { get }
+
+  /// A list of videos that should be added to the simulator before running the application
   var addVideos: [String]? { get }
+
+  /// The directory where to store the build log
   var buildlogPath: String { get }
+
+  /// Should the project be cleaned before building it?
   var clean: Bool { get }
+
+  /// Test without building, requires a derived data path
   var testWithoutBuilding: Bool? { get }
+
+  /// The configuration to use when building the app. Defaults to 'Release'
   var configuration: String? { get }
+
+  /// Additional xcpretty arguments
   var xcprettyArgs: String? { get }
+
+  /// The SDK that should be used for building the application
   var sdk: String? { get }
+
+  /// The scheme you want to use, this must be the scheme for the UI Tests
   var scheme: String? { get }
+
+  /// The number of times a test can fail before snapshot should stop retrying
   var numberOfRetries: Int { get }
+
+  /// Should snapshot stop immediately after the tests completely failed on one device?
   var stopAfterFirstError: Bool { get }
+
+  /// The directory where build products and other derived data will go
   var derivedDataPath: String? { get }
+
+  /// Should an Xcode result bundle be generated in the output directory
   var resultBundle: Bool { get }
+
+  /// The name of the target you want to test (if you desire to override the Target Application from Xcode)
   var testTargetName: String? { get }
+
+  /// Separate the log files per device and per language
   var namespaceLogFiles: String? { get }
+
+  /// Take snapshots on multiple simulators concurrently. Note: This option is only applicable when running against Xcode 9
   var concurrentSimulators: Bool { get }
 }
 
@@ -74,4 +142,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.5]
+// FastlaneRunnerAPIVersion [0.9.6]

data/fastlane_core/lib/fastlane_core/configuration/commander_generator.rb

@@ -93,9 +93,9 @@ module FastlaneCore
       return if short_switch.nil?
 
       UI.user_error!("Short option #{short_switch} already taken for key #{key}") if used_switches.include?(short_switch)
-      UI.user_error!("-v is already used for the version (key #{key})") if short_switch == "-v"
-      UI.user_error!("-h is already used for the help screen (key #{key})") if short_switch == "-h"
-      UI.user_error!("-t is already used for the trace screen (key #{key})") if short_switch == "-t"
+      UI.user_error!("-v is already used for the fastlane version (key #{key})") if short_switch == "-v"
+      UI.user_error!("-h is already used for the fastlane help screen (key #{key})") if short_switch == "-h"
+      UI.user_error!("-t is already used for the fastlane trace screen (key #{key})") if short_switch == "-t"
 
       used_switches << short_switch
     end

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -120,7 +120,7 @@ module FastlaneCore
           index = @available_options.find_index { |item| item.key == conflicting_option_key }
           conflicting_option = @available_options[index]
 
-          # ignore conflicts because because value of conflict option is nil
+          # ignore conflicts because value of conflict option is nil
           next if @values[conflicting_option.key].nil?
 
           if current.conflict_block

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -307,7 +307,7 @@ module FastlaneCore
         logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive").shellescape
         FileUtils.rm_rf(logarchive_dst)
         FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
-        command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst} 2>/dev/null"
+        command = "xcrun simctl spawn --standalone #{device.udid} log collect --output #{logarchive_dst} 2>/dev/null"
         FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
       end
     end

data/fastlane_core/lib/fastlane_core/swag.rb

@@ -45,7 +45,7 @@ module FastlaneCore
 
     def self.show_loader
       return unless should_be_shown?
-      # sound is disabled as i didn't find a royality free nice midi :(
+      # sound is disabled as I didn't find a royality free nice midi :(
       @output = StringIO.new
       # if FastlaneCore::Env.truthy?("FL_DO_SOUND")
       #  @sound_thr = Thread.new do

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -117,7 +117,7 @@ module Commander
             abort(e.to_s)
           end
         end
-      rescue FastlaneCore::Interface::FastlaneCommonException => e # these are exceptions that we dont count as crashes
+      rescue FastlaneCore::Interface::FastlaneCommonException => e # these are exceptions that we don't count as crashes
         display_user_error!(e, e.to_s)
       rescue FastlaneCore::Interface::FastlaneError => e # user_error!
         rescue_fastlane_error(e)

data/match/lib/match/importer.rb

@@ -17,7 +17,7 @@ module Match
       UI.user_error!("Certificate does not exist at path: #{cert_path}") unless File.exist?(cert_path)
       UI.user_error!("Private key does not exist at path: #{p12_path}") unless File.exist?(p12_path)
 
-      # Base64 encrypt contents to find match from API to find a cert ID
+      # Base64 encode contents to find match from API to find a cert ID
       cert_contents_base_64 = Base64.strict_encode64(File.open(cert_path).read)
 
       # Storage

data/match/lib/match/storage/google_cloud_storage.rb

@@ -293,6 +293,9 @@ module Match
       end
 
       def ensure_bucket_is_selected
+        # Skip the instructions if the user provided a bucket name
+        return unless self.bucket_name.to_s.length == 0
+
         created_bucket = UI.confirm("Did you already create a Google Cloud Storage bucket?")
         while self.bucket_name.to_s.length == 0
           unless created_bucket

data/scan/lib/scan/error_handler.rb

@@ -6,8 +6,13 @@ module Scan
     class << self
       # @param [String] The output of the errored build
       # This method should raise an exception in any case, as the return code indicated a failed build
-      def handle_build_error(output)
-        # The order of the handling below is import
+      def handle_build_error(output, log_path)
+        # The order of the handling below is important
+
+        instruction = 'See the log'
+        location = Scan.config[:suppress_xcode_output] ? "here: '#{log_path}'" : "above"
+        details = "#{instruction} #{location}."
+
         case output
         when /US\-ASCII/
           print("Your shell environment is not correctly configured")
@@ -23,7 +28,7 @@ module Scan
           print("For more information visit this stackoverflow answer:")
           print("https://stackoverflow.com/a/17031697/445598")
         when /Testing failed/
-          UI.build_failure!("Error building the application - see the log above")
+          UI.build_failure!("Error building the application. #{details}")
         when /Executed/, /Failing tests:/
           # this is *really* important:
           # we don't want to raise an exception here
@@ -38,7 +43,7 @@ module Scan
           # followed by a list of tests that failed.
           return
         end
-        UI.build_failure!("Error building/testing the application - see the log above")
+        UI.build_failure!("Error building/testing the application. #{details}")
       end
 
       private

data/scan/lib/scan/runner.rb

@@ -67,7 +67,7 @@ module Scan
                                               error: proc do |error_output|
                                                 begin
                                                   exit_status = $?.exitstatus
-                                                  ErrorHandler.handle_build_error(error_output)
+                                                  ErrorHandler.handle_build_error(error_output, @test_command_generator.xcodebuild_log_path)
                                                 rescue => ex
                                                   SlackPoster.new.run({
                                                     build_errors: 1

data/sigh/lib/assets/resign.sh

@@ -474,7 +474,7 @@ function resign {
         log "Profile app identifier prefix is '$APP_IDENTIFIER_PREFIX'"
     fi
 
-    # Set new app identifer prefix if such entry exists in plist file
+    # Set new app identifier prefix if such entry exists in plist file
     PlistBuddy -c "Set :AppIdentifierPrefix $APP_IDENTIFIER_PREFIX." "$APP_PATH/Info.plist" 2>/dev/null
 
     TEAM_IDENTIFIER=$(PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n')
@@ -690,7 +690,7 @@ function resign {
         # Get the old and new app identifier (prefix)
         APP_ID_KEY="application-identifier"
         # Extract just the identifier from the value
-        # Use the fact that we are after some identifer, which is always at the start of the string
+        # Use the fact that we are after some identifier, which is always at the start of the string
         OLD_APP_ID=$(PlistBuddy -c "Print $APP_ID_KEY" "$APP_ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n')
         NEW_APP_ID=$(PlistBuddy -c "Print $APP_ID_KEY" "$PROFILE_ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n')
 

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -50,7 +50,7 @@ module Snapshot
             language = language[0]
           end
 
-          # Clear logs so subsequent xcodebuild executions dont append to old ones
+          # Clear logs so subsequent xcodebuild executions don't append to old ones
           log_path = xcodebuild_log_path(language: language, locale: locale)
           File.delete(log_path) if File.exist?(log_path)
 

data/spaceship/lib/spaceship/client.rb

@@ -619,8 +619,8 @@ module Spaceship
     def with_retry(tries = 5, &_block)
       return yield
     rescue \
-        Faraday::Error::ConnectionFailed,
-        Faraday::Error::TimeoutError, # New Faraday version: Faraday::TimeoutError => ex
+        Faraday::ConnectionFailed,
+        Faraday::TimeoutError,
         BadGatewayError,
         AppleTimeoutError,
         GatewayTimeoutError => ex

data/supply/lib/supply.rb

@@ -3,6 +3,7 @@ require 'supply/options'
 require 'supply/client'
 require 'supply/listing'
 require 'supply/apk_listing'
+require 'supply/release_listing'
 require 'supply/uploader'
 require 'supply/languages'
 
@@ -23,8 +24,30 @@ module Supply
 
   CHANGELOGS_FOLDER_NAME = "changelogs"
 
+  # https://developers.google.com/android-publisher/#publishing
+  module Tracks
+    PRODUCTION = "production"
+    BETA = "beta"
+    ALPHA = "alpha"
+    INTERNAL = "internal"
+
+    DEFAULTS = [PRODUCTION, BETA, ALPHA, INTERNAL]
+    DEFAULT = PRODUCTION
+  end
+
+  # https://developers.google.com/android-publisher/api-ref/edits/tracks
+  module ReleaseStatus
+    COMPLETED = "completed"
+    DRAFT = "draft"
+    HALTED = "halted"
+    IN_PROGRESS = "inProgress"
+
+    ALL = [COMPLETED, DRAFT, HALTED, IN_PROGRESS]
+  end
+
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
   UI = FastlaneCore::UI
+  Boolean = Fastlane::Boolean
   ROOT = Pathname.new(File.expand_path('../..', __FILE__))
   DESCRIPTION = "Command line tool for updating Android apps and their metadata on the Google Play Store".freeze
 end

data/supply/lib/supply/client.rb

@@ -1,6 +1,6 @@
 require 'googleauth'
-require 'google/apis/androidpublisher_v2'
-Androidpublisher = Google::Apis::AndroidpublisherV2
+require 'google/apis/androidpublisher_v3'
+AndroidPublisher = Google::Apis::AndroidpublisherV3
 
 require 'net/http'
 
@@ -96,8 +96,8 @@ module Supply
   end
 
   class Client < AbstractGoogleServiceClient
-    SERVICE = Androidpublisher::AndroidPublisherService
-    SCOPE = Androidpublisher::AUTH_ANDROIDPUBLISHER
+    SERVICE = AndroidPublisher::AndroidPublisherService
+    SCOPE = AndroidPublisher::AUTH_ANDROIDPUBLISHER
 
     # Editing something
     # Reference to the entry we're currently editing. Might be nil if don't have one open
@@ -176,7 +176,7 @@ module Supply
     def listings
       ensure_active_edit!
 
-      result = call_google_api { client.list_listings(current_package_name, current_edit.id) }
+      result = call_google_api { client.list_edit_listings(current_package_name, current_edit.id) }
 
       return result.listings.map do |row|
         Listing.new(self, row.language, row)
@@ -188,7 +188,7 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = client.get_listing(
+        result = client.get_edit_listing(
           current_package_name,
           current_edit.id,
           language
@@ -205,7 +205,7 @@ module Supply
     def apks_version_codes
       ensure_active_edit!
 
-      result = call_google_api { client.list_apks(current_package_name, current_edit.id) }
+      result = call_google_api { client.list_edit_apks(current_package_name, current_edit.id) }
 
       return Array(result.apks).map(&:version_code)
     end
@@ -219,23 +219,57 @@ module Supply
       return Array(result.bundles).map(&:version_code)
     end
 
-    # Get a list of all apk listings (changelogs) - returns the list
-    def apk_listings(apk_version_code)
+    def release_listings(version)
       ensure_active_edit!
 
-      result = call_google_api do
-        client.list_apk_listings(
-          current_package_name,
-          current_edit.id,
-          apk_version_code
-        )
+      # Verify that tracks have releases
+      filtered_tracks = tracks.select { |t| !t.releases.nil? && t.releases.any? { |r| r.name == version } }
+
+      if filtered_tracks.length > 1
+        # Production track takes precedence if version is present in multiple tracks
+        # E.g.: A release might've been promoted from Alpha/Beta track. This means the release will be present in two or more tracks
+        if filtered_tracks.any? { |t| t.track == Supply::Tracks::DEFAULT }
+          filtered_tracks = filtered_tracks.select { |t| t.track == Supply::Tracks::DEFAULT }
+        else
+          # E.g.: A release might be in both Alpha & Beta (not sure if this is possible, just catching if it ever happens), giving Beta precedence.
+          filtered_tracks = filtered_tracks.select { |t| t.track == Supply::Tracks::BETA }
+        end
+      end
+
+      filtered_track = filtered_tracks.first
+      if filtered_track.nil?
+        UI.user_error!("Unable to find version '#{version}' for '#{current_package_name}' in all tracks. Please double check the version number.")
+        return nil
+      else
+        UI.message("Found '#{version}' in '#{filtered_track.track}' track.")
+      end
+
+      filtered_release = filtered_track.releases.first { |r| r.name == version }
+
+      # Since we can release on Alpha/Beta without release notes.
+      if filtered_release.release_notes.nil?
+        UI.user_error!("Version '#{version}' for '#{current_package_name}' does not seem to have any release notes. Nothing to download.")
+        return nil
       end
 
-      return (result.listings || []).map do |row|
-        ApkListing.new(row.recent_changes, row.language, apk_version_code)
+      return filtered_release.release_notes.map do |row|
+        Supply::ReleaseListing.new(filtered_track, filtered_release.name, filtered_release.version_codes, row.language, row.text)
       end
     end
 
+    def latest_version(track)
+      latest_version = tracks.select { |t| t.track == Supply::Tracks::DEFAULT }.map(&:releases).flatten.max_by(&:name)
+
+      # Check if user specified '--track' option if version information from 'production' track is nil
+      if latest_version.nil? && track == Supply::Tracks::DEFAULT
+        UI.user_error!(%(Unable to find latest version information from "#{Supply::Tracks::DEFAULT}" track. Please specify track information by using the '--track' option.))
+      else
+        latest_version = tracks.select { |t| t.track == track }.map(&:releases).flatten.max_by(&:name)
+      end
+
+      return latest_version
+    end
+
     #####################################################
     # @!group Modifying data
     #####################################################
@@ -244,7 +278,7 @@ 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,
@@ -253,7 +287,7 @@ module Supply
       })
 
       call_google_api do
-        client.update_listing(
+        client.update_edit_listing(
           current_package_name,
           current_edit.id,
           language,
@@ -266,7 +300,7 @@ module Supply
       ensure_active_edit!
 
       result_upload = call_google_api do
-        client.upload_apk(
+        client.upload_edit_apk(
           current_package_name,
           current_edit.id,
           upload_source: path_to_apk
@@ -306,29 +340,28 @@ module Supply
       return result_upload.version_code
     end
 
-    # Updates the track for the provided version code(s)
-    def update_track(track, rollout, apk_version_code)
+    # Get a list of all tracks - returns the list
+    def tracks(*tracknames)
       ensure_active_edit!
 
-      track_version_codes = apk_version_code.kind_of?(Array) ? apk_version_code : [apk_version_code]
+      all_tracks = call_google_api { client.list_edit_tracks(current_package_name, current_edit.id) }.tracks
+
+      if tracknames.length > 0
+        all_tracks = all_tracks.select { |track| tracknames.include?(track.track) }
+      end
 
-      # This change happened on 2018-04-24
-      # rollout cannot be sent on any other track besides "rollout"
-      # https://github.com/fastlane/fastlane/issues/12372
-      rollout = nil unless track == "rollout"
+      return all_tracks
+    end
 
-      track_body = Androidpublisher::Track.new({
-        track: track,
-        user_fraction: rollout,
-        version_codes: track_version_codes
-      })
+    def update_track(track_name, track_object)
+      ensure_active_edit!
 
       call_google_api do
-        client.update_track(
+        client.update_edit_track(
           current_package_name,
           current_edit.id,
-          track,
-          track_body
+          track_name,
+          track_object
         )
       end
     end
@@ -338,33 +371,27 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = client.get_track(
+        result = client.get_edit_track(
           current_package_name,
           current_edit.id,
           track
         )
-        return result.version_codes || []
+        return result.releases.flat_map(&:version_codes) || []
       rescue Google::Apis::ClientError => e
         return [] if e.status_code == 404 && e.to_s.include?("trackEmpty")
         raise
       end
     end
 
-    def update_apk_listing_for_language(apk_listing)
+    def upload_changelogs(track, track_name)
       ensure_active_edit!
 
-      apk_listing_object = Androidpublisher::ApkListing.new({
-        language: apk_listing.language,
-        recent_changes: apk_listing.recent_changes
-      })
-
       call_google_api do
-        client.update_apk_listing(
+        client.update_edit_track(
           current_package_name,
-          current_edit.id,
-          apk_listing.apk_version_code,
-          apk_listing.language,
-          apk_listing_object
+          self.current_edit.id,
+          track_name,
+          track
         )
       end
     end
@@ -373,12 +400,12 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        client.update_expansion_file(
+        client.update_edit_expansionfile(
           current_package_name,
           current_edit.id,
           apk_version_code,
           expansion_file_type,
-          Google::Apis::AndroidpublisherV2::ExpansionFile.new(
+          AndroidPublisher::ExpansionFile.new(
             references_version: references_version,
             file_size: file_size
           )
@@ -394,7 +421,7 @@ module Supply
       ensure_active_edit!
 
       result = call_google_api do
-        client.list_images(
+        client.list_edit_images(
           current_package_name,
           current_edit.id,
           language,
@@ -402,7 +429,26 @@ module Supply
         )
       end
 
-      (result.images || []).map(&:url)
+      urls = (result.images || []).map(&:url)
+      images = urls.map do |url|
+        uri = URI.parse(url)
+        clean_url = [
+          uri.scheme,
+          uri.userinfo,
+          uri.host,
+          uri.port,
+          uri.path
+        ].join
+
+        UI.verbose("Initial URL received: '#{url}'")
+        UI.verbose("Removed params ('#{uri.query}') from the URL")
+        UI.verbose("URL after removing params: '#{clean_url}'")
+
+        full_url = "#{url}=s0" # '=s0' param ensures full image size is returned (https://github.com/fastlane/fastlane/pull/14322#issuecomment-473012462)
+        full_url
+      end
+
+      return images
     end
 
     # @param image_type (e.g. phoneScreenshots, sevenInchScreenshots, ...)
@@ -410,7 +456,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        client.upload_image(
+        client.upload_edit_image(
           current_package_name,
           current_edit.id,
           language,
@@ -425,7 +471,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        client.delete_all_images(
+        client.deleteall_edit_image(
           current_package_name,
           current_edit.id,
           language,
@@ -438,7 +484,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        client.upload_expansion_file(
+        client.upload_edit_expansionfile(
           current_package_name,
           current_edit.id,
           apk_version_code,