fastlane 2.133.0 → 2.136.0

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,

data/supply/lib/supply/options.rb

@@ -5,7 +5,6 @@ module Supply
   class Options
     # rubocop:disable Metrics/PerceivedComplexity
     def self.available_options
-      default_tracks = %w(production beta alpha internal rollout)
       @options ||= [
         FastlaneCore::ConfigItem.new(key: :package_name,
                                      env_name: "SUPPLY_PACKAGE_NAME",
@@ -14,11 +13,37 @@ module Supply
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:package_name),
                                      default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :version_name,
+                                     env_name: "SUPPLY_VERSION_NAME",
+                                     short_option: "-n",
+                                     optional: true,
+                                     description: "Version name (used when uploading new apks/aabs) - defaults to 'versionName' in build.gradle or AndroidManifest.xml",
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:version_name),
+                                     default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :version_code,
+                                     env_name: "SUPPLY_VERSION_CODE",
+                                     short_option: "-C",
+                                     optional: true,
+                                     type: Integer,
+                                     description: "Version code (used when updating rollout or promoting specific versions)",
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:version_code),
+                                     default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :release_status,
+                                     env_name: "SUPPLY_RELEASE_STATUS",
+                                     short_option: "-e",
+                                     optional: true,
+                                     description: "Release status (used when uploading new apks/aabs) - valid values are #{Supply::ReleaseStatus::ALL.join(', ')}",
+                                     default_value: Supply::ReleaseStatus::COMPLETED,
+                                     default_value_dynamic: true,
+                                     verify_block: proc do |value|
+                                                     UI.user_error!("Value must be one of '#{Supply::RELEASE_STATUS}'") unless Supply::ReleaseStatus::ALL.include?(value)
+                                                   end),
         FastlaneCore::ConfigItem.new(key: :track,
                                      short_option: "-a",
                                      env_name: "SUPPLY_TRACK",
-                                     description: "The track of the application to use. The default available tracks are: #{default_tracks.join(', ')}",
-                                     default_value: 'production'),
+                                     description: "The track of the application to use. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}",
+                                     default_value: Supply::Tracks::DEFAULT,
+                                     type: String),
         FastlaneCore::ConfigItem.new(key: :rollout,
                                      short_option: "-r",
                                      description: "The percentage of the user fraction when uploading to the rollout track",
@@ -104,6 +129,7 @@ module Supply
         FastlaneCore::ConfigItem.new(key: :apk_paths,
                                      env_name: "SUPPLY_APK_PATHS",
                                      conflicting_options: [:apk, :aab, :aab_paths],
+                                     code_gen_sensitive: true,
                                      optional: true,
                                      type: Array,
                                      description: "An array of paths to APK files to upload",
@@ -131,6 +157,7 @@ module Supply
         FastlaneCore::ConfigItem.new(key: :aab_paths,
                                      env_name: "SUPPLY_AAB_PATHS",
                                      conflicting_options: [:apk, :apk_paths, :aab],
+                                     code_gen_sensitive: true,
                                      optional: true,
                                      type: Array,
                                      description: "An array of paths to AAB files to upload",
@@ -146,41 +173,47 @@ module Supply
                                      env_name: "SUPPLY_SKIP_UPLOAD_APK",
                                      optional: true,
                                      description: "Whether to skip uploading APK",
-                                     is_string: false,
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_upload_aab,
                                      env_name: "SUPPLY_SKIP_UPLOAD_AAB",
                                      optional: true,
                                      description: "Whether to skip uploading AAB",
-                                     is_string: false,
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_upload_metadata,
                                      env_name: "SUPPLY_SKIP_UPLOAD_METADATA",
                                      optional: true,
-                                     description: "Whether to skip uploading metadata",
-                                     is_string: false,
+                                     description: "Whether to skip uploading metadata, changelogs not included",
+                                     type: Boolean,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_upload_changelogs,
+                                     env_name: "SUPPLY_SKIP_UPLOAD_CHANGELOGS",
+                                     optional: true,
+                                     description: "Whether to skip uploading changelogs",
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_upload_images,
                                      env_name: "SUPPLY_SKIP_UPLOAD_IMAGES",
                                      optional: true,
                                      description: "Whether to skip uploading images, screenshots not included",
-                                     is_string: false,
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_upload_screenshots,
                                      env_name: "SUPPLY_SKIP_UPLOAD_SCREENSHOTS",
                                      optional: true,
                                      description: "Whether to skip uploading SCREENSHOTS",
-                                     is_string: false,
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :track_promote_to,
                                      env_name: "SUPPLY_TRACK_PROMOTE_TO",
                                      optional: true,
-                                     description: "The track to promote to. The default available tracks are: #{default_tracks.join(', ')}"),
+                                     description: "The track to promote to. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}"),
         FastlaneCore::ConfigItem.new(key: :validate_only,
                                      env_name: "SUPPLY_VALIDATE_ONLY",
                                      optional: true,
                                      description: "Only validate changes with Google Play rather than actually publish",
-                                     is_string: false,
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :mapping,
                                      env_name: "SUPPLY_MAPPING",
@@ -215,7 +248,8 @@ module Supply
                                      env_name: "SUPPLY_CHECK_SUPERSEDED_TRACKS",
                                      optional: true,
                                      description: "Check the other tracks for superseded versions and disable them",
-                                     is_string: false,
+                                     deprecated: "Google Play does this automatically now",
+                                     type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :timeout,
                                      env_name: "SUPPLY_TIMEOUT",
@@ -227,16 +261,18 @@ module Supply
                                      env_name: "SUPPLY_DEACTIVATE_ON_PROMOTE",
                                      optional: true,
                                      description: "When promoting to a new track, deactivate the binary in the origin track",
-                                     is_string: false,
+                                     deprecated: "Google Play does this automatically now",
+                                     type: Boolean,
                                      default_value: true),
         FastlaneCore::ConfigItem.new(key: :version_codes_to_retain,
                                      optional: true,
                                      type: Array,
                                      description: "An array of version codes to retain when publishing a new APK",
                                      verify_block: proc do |version_codes|
+                                       version_codes = version_codes.map(&:to_i)
                                        UI.user_error!("Could not evaluate array from '#{version_codes}'") unless version_codes.kind_of?(Array)
                                        version_codes.each do |version_code|
-                                         UI.user_error!("Version code '#{version_code}' is not an integer") unless version_code.kind_of?(Integer)
+                                         UI.user_error!("Version code '#{version_code}' is not an integer") if version_code == 0
                                        end
                                      end),
         FastlaneCore::ConfigItem.new(key: :obb_main_references_version,