fastlane 2.130.0 → 2.135.0

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/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -32,7 +32,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_apps(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(bundle_id)
@@ -54,7 +54,7 @@ module Spaceship
         filter[:apps] = id
 
         resps = Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       #
@@ -66,7 +66,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_builds(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -74,7 +74,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_build_deliveries(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -82,7 +82,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_beta_app_localizations(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -90,7 +90,7 @@ module Spaceship
         filter[:app] = id
 
         resps = Spaceship::ConnectAPI.get_beta_groups(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/build.rb

@@ -109,7 +109,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        models = resps.map(&:to_models).flatten
+        models = resps.flat_map(&:to_models)
 
         # Filtering after models are fetched since there is no way to do this in a query param filter
         if platform
@@ -138,7 +138,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -148,7 +148,7 @@ module Spaceship
           sort: sort,
           limit: limit
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def post_beta_app_review_submission

data/spaceship/lib/spaceship/connect_api/models/build_delivery.rb

@@ -29,7 +29,7 @@ module Spaceship
           filter: { app: app_id, cfBundleShortVersionString: version, cfBundleVersion: build_number },
           limit: 1
         ).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/bundle_id.rb

@@ -35,7 +35,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_bundle_ids(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
 
       def self.get(bundle_id_id: nil, includes: nil)

data/spaceship/lib/spaceship/connect_api/models/certificate.rb

@@ -41,7 +41,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_certificates(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/device.rb

@@ -46,7 +46,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_devices(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/profile.rb

@@ -53,7 +53,7 @@ module Spaceship
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_profiles(filter: filter, includes: includes).all_pages
-        return resps.map(&:to_models).flatten
+        return resps.flat_map(&:to_models)
       end
     end
   end

data/spaceship/lib/spaceship/portal/provisioning_profile.rb

@@ -457,7 +457,7 @@ module Spaceship
             devices.map(&:id),
             mac: mac?,
             sub_platform: tvos? ? 'tvOS' : nil,
-            template_name: template_name
+            template_name: is_template_profile ? template.purpose_name : nil
           )
         end
 

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -192,6 +192,9 @@ module Spaceship
       # @return (Hash) Represents the trailers of this app version (read-only)
       attr_reader :trailers
 
+      # @return (Hash) A hash representing all in-app purchases that can get submitted with this version
+      attr_reader :in_app_purchases
+
       # @return (Hash) Represents the phased_release hash (read-only)
       #   For now, please use the `toggle_phased_release` method and call `.save!`
       #   as the API will probably change in the future
@@ -233,6 +236,7 @@ module Spaceship
         'supportsAppleWatch' => :supports_apple_watch,
         'versionId' => :version_id,
         'version.value' => :version,
+        'submittableAddOns.value' => :in_app_purchases,
         'phasedRelease' => :phased_release,
 
         # GeoJson

data/spaceship/lib/spaceship/tunes/application.rb

@@ -158,6 +158,10 @@ module Spaceship
         client.get_resolution_center(apple_id, platform)
       end
 
+      def reply_resolution_center(app_id, platform, thread_id, version_id, version_number, from, message_body)
+        client.post_resolution_center(app_id, platform, thread_id, version_id, version_number, from, message_body)
+      end
+
       def ratings(version_id: '', storefront: '')
         attrs = client.get_ratings(apple_id, platform, version_id, storefront)
         attrs[:application] = self

data/spaceship/lib/spaceship/tunes/iap_family_details.rb

@@ -9,12 +9,20 @@ module Spaceship
       # @return (String) the family name
       attr_accessor :name
 
-      # @return (Intger) the Family Id
+      # @return (Intger) the family id
       attr_accessor :family_id
 
+      # @return (Array) all linked in-app purchases of this family
+      attr_accessor :linked_iaps
+
+      # @return (Intger) amount of linked in-app purchases of this family (read-only)
+      attr_accessor :iap_count
+
       attr_mapping({
         'id' => :family_id,
-        'name.value' => :name
+        'name.value' => :name,
+        'activeAddOns' => :linked_iaps,
+        'totalActiveAddOns' => :iap_count
       })
 
       def versions=(value = {})

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

@@ -352,6 +352,31 @@ module Spaceship
       parse_response(r, 'data')
     end
 
+    def post_resolution_center(app_id, platform, thread_id, version_id, version_number, from, message_body)
+      r = request(:post) do |req|
+        req.url("ra/apps/#{app_id}/platforms/#{platform}/resolutionCenter")
+        req.body = {
+          appNotes: {
+            threads: [{
+              id: thread_id,
+              versionId: version_id,
+              version: version_number,
+              messages: [{
+                from: from,
+                date: DateTime.now.strftime('%Q'),
+                body: message_body,
+                tokens: []
+              }]
+            }]
+          }
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+
+      data = parse_response(r, 'data')
+      handle_itc_response(data)
+    end
+
     def get_ratings(app_id, platform, version_id = '', storefront = '')
       # if storefront or version_id is empty api fails
       rating_url = "ra/apps/#{app_id}/platforms/#{platform}/reviews/summary"

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,