fastlane 2.136.0 → 2.141.0

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

@@ -10,6 +10,7 @@ module Spaceship
       attr_accessor :external_build_state
 
       module InternalState
+        PROCESSING = "PROCESSING"
         PROCESSING_EXCEPTION = "PROCESSING_EXCEPTION"
         MISSING_EXPORT_COMPLIANCE = "MISSING_EXPORT_COMPLIANCE"
         READY_FOR_BETA_TESTING = "READY_FOR_BETA_TESTING"
@@ -47,6 +48,10 @@ module Spaceship
       #
       # Helpers
       #
+      #
+      def ready_for_internal_testing?
+        return internal_build_state == InternalState::READY_FOR_BETA_TESTING
+      end
 
       def ready_for_beta_submission?
         return external_build_state == ExternalState::READY_FOR_BETA_SUBMISSION

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -317,6 +317,21 @@ module Spaceship
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
         Client.instance.get("preReleaseVersions", params)
       end
+
+      #
+      # betaFeedbacks (private API as of end 2019)
+      #
+
+      def get_beta_feedback(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaFeedbacks", params)
+      end
+
+      def delete_beta_feedback(feedback_id: nil)
+        raise "Feedback id is nil" if feedback_id.nil?
+
+        Client.instance.delete("betaFeedbacks/#{feedback_id}")
+      end
     end
   end
 end

data/spaceship/lib/spaceship/portal/app.rb

@@ -108,9 +108,18 @@ module Spaceship
         # @return (App) The app you're looking for. This is nil if the app can't be found.
         def find(bundle_id, mac: false)
           raise "`bundle_id` parameter must not be nil" if bundle_id.nil?
-          all(mac: mac).find do |app|
-            return app if app.bundle_id.casecmp(bundle_id) == 0
+          found_app = all(mac: mac).find do |app|
+            app if app.bundle_id.casecmp(bundle_id) == 0
           end
+
+          # Find catalyst enabled mac apps (look for mac first and then iOS)
+          if !found_app && mac
+            found_app = all(mac: false).find do |app|
+              app if app.bundle_id.casecmp(bundle_id) == 0
+            end
+          end
+
+          found_app
         end
       end
 

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -105,17 +105,6 @@ module Spaceship
         end
       end
 
-      # find a specific product
-      # @param product_id (String) Product Id
-      def find(product_id)
-        all.each do |product|
-          if product.product_id == product_id
-            return product
-          end
-        end
-        return nil
-      end
-
       # return all available In-App-Purchase's of current app
       # this is not paged inside iTC-API so if you have a lot if IAP's (2k+)
       # it might take some time to load, same as it takes when you load the list via App Store Connect
@@ -132,6 +121,17 @@ module Spaceship
         return_iaps
       end
 
+      # find a specific product
+      # @param product_id (String) Product Id
+      def find(product_id)
+        all.each do |product|
+          if product.product_id == product_id
+            return product
+          end
+        end
+        return nil
+      end
+
       private
 
       def find_product_with_retries(product_id, max_tries)

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -80,7 +80,9 @@ module Spaceship
           language = localized_version["value"]["localeCode"]
           parsed_versions[language.to_sym] = {
             name: localized_version["value"]["name"]["value"],
-            description: localized_version["value"]["description"]["value"]
+            description: localized_version["value"]["description"]["value"],
+            id: localized_version["value"]["id"],
+            status: localized_version["value"]["status"]
           }
         end
         return parsed_versions
@@ -98,7 +100,8 @@ module Spaceship
             "value" =>   {
               "name" =>  { "value" => current_version[:name] },
               "description" =>  { "value" => current_version[:description] },
-              "localeCode" =>  language.to_s
+              "localeCode" => language.to_s,
+              "id" => current_version[:id]
             }
           }
         end
@@ -167,7 +170,8 @@ module Spaceship
                     "value" =>  {
                       "description" => { "value" => value[:description] },
                       "name" => { "value" => value[:name] },
-                      "localeCode" => language.to_s
+                      "localeCode" => language.to_s,
+                      "id" => value[:id]
                     }
           }
         end

data/spaceship/lib/spaceship/tunes/iap_families.rb

@@ -40,7 +40,7 @@ module Spaceship
         client.create_iap_family(app_id: self.application.apple_id, name: name, product_id: product_id, reference_name: reference_name, versions: versions_array)
       end
 
-      # returns a list of all families
+      # returns a list of all available subscription groups/families of the current In-App-Purchase
       def all
         r = client.iap_families(app_id: self.application.apple_id)
         return_families = []
@@ -52,6 +52,17 @@ module Spaceship
         end
         return_families
       end
+
+      # find a specific family
+      # @param family_id (String) Family Id
+      def find(family_id)
+        all.each do |family|
+          if family.family_id == family_id
+            return family
+          end
+        end
+        return nil
+      end
     end
   end
 end

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

@@ -18,13 +18,34 @@ module Spaceship
       # @return (Intger) amount of linked in-app purchases of this family (read-only)
       attr_accessor :iap_count
 
+      # @return (Array) of all in-app purchase family details
+      attr_accessor :family_details
+
       attr_mapping({
         'id' => :family_id,
         'name.value' => :name,
         'activeAddOns' => :linked_iaps,
-        'totalActiveAddOns' => :iap_count
+        'totalActiveAddOns' => :iap_count,
+        'details.value' => :family_details
       })
 
+      # @return (Hash) localized names
+      def versions
+        parsed_versions = {}
+        raw_versions = raw_data["details"]["value"]
+        raw_versions.each do |version|
+          language = version["value"]["localeCode"]["value"]
+          parsed_versions[language.to_sym] = {
+            subscription_name: version["value"]["subscriptionName"]["value"],
+            name: version["value"]["name"]["value"],
+            id: version["value"]["id"],
+            status: version["value"]["status"]
+          }
+        end
+        return parsed_versions
+      end
+
+      # transforms user-set versions to iTC ones
       def versions=(value = {})
         if value.kind_of?(Array)
           # input that comes from iTC api
@@ -36,7 +57,8 @@ module Spaceship
             "value" =>   {
               "subscriptionName" =>  { "value" => current_version[:subscription_name] },
               "name" =>  { "value" => current_version[:name] },
-              "localeCode" => { "value" => language }
+              "localeCode" => { "value" => language },
+              "id" => current_version[:id]
             }
           }
         end
@@ -44,20 +66,6 @@ module Spaceship
         raw_data.set(["details"], { "value" => new_versions })
       end
 
-      # @return (Hash) localized names
-      def versions
-        parsed_versions = {}
-        raw_versions = raw_data["details"]["value"]
-        raw_versions.each do |version|
-          language = version["value"]["localeCode"]["value"]
-          parsed_versions[language.to_sym] = {
-            subscription_name: version["value"]["subscriptionName"]["value"],
-            name: version["value"]["name"]["value"]
-          }
-        end
-        return parsed_versions
-      end
-
       # modify existing family
       def save!
         # Transform localization versions back to original format.
@@ -67,7 +75,8 @@ module Spaceship
                                "value" => {
                                  "subscriptionName" => { "value" => value[:subscription_name] },
                                  "name" => { "value" => value[:name] },
-                                 "localeCode" => { "value" => language_code.to_s }
+                                 "localeCode" => { "value" => language_code.to_s },
+                                 "id" => value[:id]
                                }
                             }
         end

data/spaceship/lib/spaceship/tunes/iap_status.rb

@@ -28,6 +28,9 @@ module Spaceship
       # The developer took the app from the App Store
       DEVELOPER_REMOVED_FROM_SALE = "Developer Removed From Sale"
 
+      # In-app purchase need developer's action
+      DEVELOPER_ACTION_NEEDED = "Developer Action Needed"
+
       # Get the iap status matching based on a string (given by App Store Connect)
       def self.get_from_string(text)
         mapping = {
@@ -38,7 +41,8 @@ module Spaceship
           'readyForSale' => APPROVED,
           'deleted' => DELETED,
           'rejected' => REJECTED,
-          'developerRemovedFromSale' => DEVELOPER_REMOVED_FROM_SALE
+          'developerRemovedFromSale' => DEVELOPER_REMOVED_FROM_SALE,
+          'developerActionNeeded' => DEVELOPER_ACTION_NEEDED
         }
 
         mapping.each do |itc_status, readable_status|

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

@@ -400,7 +400,7 @@ module Spaceship
         rating_url << "sort=REVIEW_SORT_ORDER_MOST_RECENT"
         rating_url << "&index=#{index}"
         rating_url << "&storefront=#{storefront}" unless storefront.empty?
-        rating_url << "&version_id=#{version_id}" unless version_id.empty?
+        rating_url << "&versionId=#{version_id}" unless version_id.empty?
 
         r = request(:get, rating_url)
         all_reviews.concat(parse_response(r, 'data')['reviews'])
@@ -627,7 +627,7 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
-    def transform_to_raw_pricing_intervals(app_id = nil, purchase_id = nil, pricing_intervals = nil, subscription_price_target = nil)
+    def transform_to_raw_pricing_intervals(app_id = nil, purchase_id = nil, pricing_intervals = 5, subscription_price_target = nil)
       intervals_array = []
       if pricing_intervals
         intervals_array = pricing_intervals.map do |interval|
@@ -784,11 +784,8 @@ module Spaceship
     end
 
     def available_languages
-      r = request(:get, "ra/apps/storePreview/regionCountryLanguage")
-      response = parse_response(r, 'data')
-      response.flat_map { |region| region["storeFronts"] }
-              .flat_map { |storefront| storefront["supportedLocaleCodes"] }
-              .uniq
+      r = request(:get, "ra/ref")
+      parse_response(r, 'data')['detailLocales']
     end
 
     #####################################################

data/supply/lib/supply/client.rb

@@ -310,6 +310,19 @@ module Supply
       return result_upload.version_code
     end
 
+    def upload_apk_to_internal_app_sharing(package_name, path_to_apk)
+      # NOTE: This Google API is a little different. It doesn't require an active edit.
+      result_upload = call_google_api do
+        client.uploadapk_internalappsharingartifact(
+          package_name,
+          upload_source: path_to_apk,
+          content_type: "application/octet-stream"
+        )
+      end
+
+      return result_upload.download_url
+    end
+
     def upload_mapping(path_to_mapping, apk_version_code)
       ensure_active_edit!
 
@@ -340,11 +353,25 @@ module Supply
       return result_upload.version_code
     end
 
+    def upload_bundle_to_internal_app_sharing(package_name, path_to_aab)
+      # NOTE: This Google API is a little different. It doesn't require an active edit.
+      result_upload = call_google_api do
+        client.uploadbundle_internalappsharingartifact(
+          package_name,
+          upload_source: path_to_aab,
+          content_type: "application/octet-stream"
+        )
+      end
+
+      return result_upload.download_url
+    end
+
     # Get a list of all tracks - returns the list
     def tracks(*tracknames)
       ensure_active_edit!
 
       all_tracks = call_google_api { client.list_edit_tracks(current_package_name, current_edit.id) }.tracks
+      all_tracks = [] unless all_tracks
 
       if tracknames.length > 0
         all_tracks = all_tracks.select { |track| tracknames.include?(track.track) }

data/supply/lib/supply/options.rb

@@ -43,7 +43,10 @@ module Supply
                                      env_name: "SUPPLY_TRACK",
                                      description: "The track of the application to use. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}",
                                      default_value: Supply::Tracks::DEFAULT,
-                                     type: String),
+                                     type: String,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
+                                     end),
         FastlaneCore::ConfigItem.new(key: :rollout,
                                      short_option: "-r",
                                      description: "The percentage of the user fraction when uploading to the rollout track",
@@ -208,7 +211,10 @@ module Supply
         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: #{Supply::Tracks::DEFAULTS.join(', ')}"),
+                                     description: "The track to promote to. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
+                                     end),
         FastlaneCore::ConfigItem.new(key: :validate_only,
                                      env_name: "SUPPLY_VALIDATE_ONLY",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -15,32 +15,62 @@ module Supply
 
       apk_version_codes.concat(Supply.config[:version_codes_to_retain]) if Supply.config[:version_codes_to_retain]
 
-      # Only update tracks if we have version codes
-      # Updating a track with empty version codes can completely clear out a track
-      update_track(apk_version_codes) unless apk_version_codes.empty?
-
-      if Supply.config[:track_promote_to]
-        promote_track
-      elsif !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
-        update_rollout
+      if !apk_version_codes.empty?
+        # Only update tracks if we have version codes
+        # update_track handle setting rollout if needed
+        # Updating a track with empty version codes can completely clear out a track
+        update_track(apk_version_codes)
+      else
+        # Only promote or rollout if we don't have version codes
+        if 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)
+
       if Supply.config[:validate_only]
-        UI.message("Validating all track and release changes with Google Play...")
+        UI.message("Validating all changes with Google Play...")
         client.validate_current_edit!
         UI.success("Successfully validated the upload to Google Play")
       else
-        UI.message("Uploading all track and release changes to Google Play...")
+        UI.message("Uploading all changes to Google Play...")
         client.commit_current_edit!
         UI.success("Successfully finished the upload to Google Play")
       end
+    end
 
-      perform_upload_meta(apk_version_codes)
+    def perform_upload_to_internal_app_sharing
+      download_urls = []
+
+      package_name = Supply.config[:package_name]
+
+      apk_paths = [Supply.config[:apk]] unless (apk_paths = Supply.config[:apk_paths])
+      apk_paths.compact!
+      apk_paths.each do |apk_path|
+        download_url = client.upload_apk_to_internal_app_sharing(package_name, apk_path)
+        download_urls << download_url
+        UI.success("Successfully uploaded APK to Internal App Sharing URL: #{download_url}")
+      end
+
+      aab_paths = [Supply.config[:aab]] unless (aab_paths = Supply.config[:aab_paths])
+      aab_paths.compact!
+      aab_paths.each do |aab_path|
+        download_url = client.upload_bundle_to_internal_app_sharing(package_name, aab_path)
+        download_urls << download_url
+        UI.success("Successfully uploaded AAB to Internal App Sharing URL: #{download_url}")
+      end
+
+      if download_urls.count == 1
+        return download_urls.first
+      else
+        return download_urls
+      end
     end
 
     def perform_upload_meta(version_codes)
-      client.begin_edit(package_name: Supply.config[:package_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?
@@ -71,16 +101,6 @@ module Supply
           upload_changelogs(release_notes, release, track) unless release_notes.empty?
         end
       end
-
-      if Supply.config[:validate_only]
-        UI.message("Validating all meta changes with Google Play...")
-        client.validate_current_edit!
-        UI.success("Successfully validated the upload to Google Play")
-      else
-        UI.message("Uploading all meta changes to Google Play...")
-        client.commit_current_edit!
-        UI.success("Successfully finished the upload to Google Play")
-      end
     end
 
     def fetch_track_and_release!(track, version_code, status = nil)
@@ -203,7 +223,13 @@ module Supply
         UI.message("Updating changelog for '#{version_code}' and language '#{language}'...")
         changelog_text = File.read(path, encoding: 'UTF-8')
       else
-        UI.message("Could not find changelog for '#{version_code}' and language '#{language}' at path #{path}...")
+        default_changelog_path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "default.txt")
+        if File.exist?(default_changelog_path)
+          UI.message("Updating changelog for '#{version_code}' and language '#{language}' to default changelog...")
+          changelog_text = File.read(default_changelog_path, encoding: 'UTF-8')
+        else
+          UI.message("Could not find changelog for '#{version_code}' and language '#{language}' at path #{path}...")
+        end
       end
 
       AndroidPublisher::LocalizedText.new({
@@ -358,8 +384,11 @@ module Supply
       )
 
       if Supply.config[:rollout]
-        track_release.status = Supply::ReleaseStatus::IN_PROGRESS
-        track_release.user_fraction = Supply.config[:rollout].to_f
+        rollout = Supply.config[:rollout].to_f
+        if rollout > 0 && rollout < 1
+          track_release.status = Supply::ReleaseStatus::IN_PROGRESS
+          track_release.user_fraction = rollout
+        end
       end
 
       tracks = client.tracks(Supply.config[:track])