fastlane 2.128.0 → 2.132.0

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/spaceauth_runner.rb

@@ -25,7 +25,7 @@ module Spaceship
         puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
         puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
         puts("")
-        puts("Execption type: #{ex.class}")
+        puts("Exception type: #{ex.class}")
         raise ex
       end
 

data/spaceship/lib/spaceship/test_flight/tester.rb

@@ -93,7 +93,7 @@ module Spaceship
       end
 
       # @return (Spaceship::TestFlight::Tester) Returns the testers matching the parameter.
-      # ITC searchs all fields, and is full text. The search results are the union of all words in the search text
+      # ITC searches all fields, and is full text. The search results are the union of all words in the search text
       # @param text (String) (required): Value used to filter the tester, case insensitive
       def self.search(app_id: nil, text: nil, is_email_exact_match: false)
         text = text.strip

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/availability.rb

@@ -1,5 +1,6 @@
 require_relative 'territory'
 require_relative 'b2b_user'
+require_relative 'b2b_organization'
 module Spaceship
   module Tunes
     class Availability < TunesBase
@@ -27,6 +28,9 @@ module Spaceship
       # @return (Array of Spaceship::Tunes::B2bUser objects) A list of users
       attr_accessor :b2b_users
 
+      # @return (Array of Spaceship::Tunes::B2bOrganization objects) A list of b2b orgs
+      attr_accessor :b2b_organizations
+
       attr_mapping(
         'theWorld' => :include_future_territories,
         'preOrder.clearedForPreOrder.value' => :cleared_for_preorder,
@@ -47,12 +51,12 @@ module Spaceship
         # Base::DataHash sets values for paths that don't exist
         obj = self.new(
           'preOrder' => {
-            'clearedForPreOrder' => {
-              'value' => false
-            },
-            'appAvailableDate' => {
-              'value' => nil
-            }
+              'clearedForPreOrder' => {
+                  'value' => false
+              },
+              'appAvailableDate' => {
+                  'value' => nil
+              }
           }
         )
 
@@ -66,8 +70,8 @@ module Spaceship
         obj.include_future_territories = params.fetch(:include_future_territories, true)
         obj.cleared_for_preorder = params.fetch(:cleared_for_preorder, false)
         obj.app_available_date = params.fetch(:app_available_date, nil)
-        obj.b2b_unavailable =  params.fetch(:b2b_unavailable, false)
-        obj.b2b_app_enabled =  params.fetch(:b2b_app_enabled, false)
+        obj.b2b_unavailable = params.fetch(:b2b_unavailable, false)
+        obj.b2b_app_enabled = params.fetch(:b2b_app_enabled, false)
         obj.educational_discount = params.fetch(:educational_discount, true)
         return obj
       end
@@ -80,6 +84,10 @@ module Spaceship
         @b2b_users || raw_data['b2bUsers'].map { |user| B2bUser.new(user) }
       end
 
+      def b2b_organizations
+        @b2b_organizations || raw_data['b2bOrganizations'].map { |user| B2bOrganization.new(user) }
+      end
+
       def b2b_app_enabled
         @b2b_app_enabled.nil? ? raw_data['b2bAppEnabled'] : @b2b_app_enabled
       end
@@ -127,6 +135,30 @@ module Spaceship
 
         return self
       end
+
+      # Updates users for b2b enabled apps
+      def update_dep_organizations(organization_list = [])
+        raise "Cannot add dep organizations if b2b is not enabled" unless b2b_app_enabled
+
+        added_orgs = b2b_organizations
+
+        # Returns if list is unchanged
+        return self if (added_orgs - organization_list) == (organization_list - added_orgs)
+
+        orgs_to_add = organization_list.reject { |organization| added_orgs.include?(organization) }
+        orgs_to_remove = added_orgs.nil? ? organization_list : added_orgs.reject { |organization| organization_list.include?(organization) }
+
+        @b2b_organizations = b2b_organizations.reject { |organization| orgs_to_remove.include?(organization) }
+        @b2b_organizations.concat(orgs_to_add)
+        @b2b_organizations.concat(orgs_to_remove.map do |organization|
+          B2bOrganization.from_id_info(dep_id: organization.dep_customer_id,
+                                       dep_name: organization.name,
+                                       dep_org_id: organization.dep_organization_id,
+                                       type: false)
+        end)
+
+        return self
+      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/b2b_organization.rb

@@ -0,0 +1,50 @@
+require_relative 'tunes_base'
+module Spaceship
+  module Tunes
+    class B2bOrganization < TunesBase
+      # @return (String) add or remove
+      attr_accessor :type
+
+      # @return (String) customer id
+      attr_accessor :dep_customer_id
+
+      # @return (String) organization id
+      attr_accessor :dep_organization_id
+
+      # @return (String) organization name
+      attr_accessor :name
+
+      # enum for types
+      class TYPE
+        ADD = "ADD"
+        REMOVE = "REMOVE"
+        NO_CHANGE = "NO_CHANGE"
+      end
+
+      attr_mapping(
+        'value.type' => :type,
+        'value.depCustomerId' => :dep_customer_id,
+        'value.organizationId' => :dep_organization_id,
+        'value.name' => :name
+      )
+
+      def self.from_id_info(dep_id: nil, dep_org_id: nil, dep_name: nil, type: TYPE::NO_CHANGE)
+        self.new({ "value" => { "type" => type, "depCustomerId" => dep_id, "organizationId" => dep_org_id, "name" => dep_name } })
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == self.state
+      end
+
+      def state
+        return [type, dep_customer_id, name]
+      end
+
+      alias eql? ==
+
+      def hash
+        state.hash
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/tunes/build_details.rb

@@ -6,36 +6,178 @@ module Spaceship
     class BuildDetails < TunesBase
       # @return (String) The App identifier of this app, provided by App Store Connect
       # @example
-      #   "1013943394"
+      #   '1013943394'
       attr_accessor :apple_id
 
-      # @return (String) Link to the dSYM file (not always available)
-      #     lol, it's unencrypted http
-      attr_accessor :dsym_url
+      # @return (Integer) Upload date of build as UNIX timestamp
+      # @example 1563813377000
+      attr_accessor :upload_date
 
-      # @return [Bool]
-      attr_accessor :include_symbols
+      # @return (String) State of the build/binary
+      # @example 'ITC.apps.preReleaseBuildStatus.Validated'
+      attr_accessor :binary_state
 
-      # @return [Integer]
-      attr_accessor :number_of_asset_packs
+      # @return (String) Name of uploaded file
+      # @example 'MyApp.ipa'
+      attr_accessor :file_name
+
+      # @return (String) SDK used to build app
+      # @example '13A340'
+      attr_accessor :build_sdk
+
+      # @return (String) Platform
+      # @example '13A340'
+      attr_accessor :build_platform
+
+      # @return (String) Bundle ID of build
+      # @example 'com.sample.app'
+      attr_accessor :bundle_id
+
+      # @return (String) Name of app
+      # @example 'Test App'
+      attr_accessor :app_name
+
+      # @return (String) Supported architectures of the build
+      # @example 'armv7, arm64'
+      attr_accessor :supported_architectures
+
+      # @return (String) Localizations of the build
+      # @example 'English'
+      attr_accessor :localizations
+
+      # @return (Boolean) Is this a Newsstand app?
+      # @example false
+      attr_accessor :newsstand_app
+
+      # @return (Boolean) Does the build contain an app icon?
+      # @example true
+      attr_accessor :prerendered_icon_flag
+
+      # @return [Hash] containing all entitlements for all targets
+      # @example 'Sample.app/Sample: {'com.apple.developer.team-identifier': 'ABC123DEF456'}'
+      attr_accessor :entitlements
+
+      # @return (String) Platform of the app
+      # @example 'ios'
+      attr_accessor :app_plattform
+
+      # @return (String) Device Requirements / Device Protocols
+      attr_accessor :device_protocols
+
+      # @return (String) Version code of the build
+      # @example '4'
+      attr_accessor :cf_bundle_version
+
+      # @return (String) Version code of the build train
+      # @example '1.6'
+      attr_accessor :cf_bundle_short_version
+
+      # @return (String) Minimum iOS Version
+      # @example '9.3'
+      attr_accessor :min_os_version
+
+      # @return (String) Enabled Device Family
+      # @example 'iPhone / iPod touch, iPad''
+      attr_accessor :device_families
+
+      # @return (String) Required Capabilities
+      # @example 'armv7'
+      attr_accessor :capabilities
+
+      # @return (Int) Compressed File Size in bytes
+      # @example '9365224'
+      attr_accessor :size_in_bytes
+
+      # @return (Hash) Estimated App Store file sizes for all devices in bytes
+      attr_accessor :sizes_in_bytes
 
-      # @return [Bool]
+      # @return (Hash) Estimated App Store file sizes for all devices in bytes
+      attr_accessor :sizes_in_bytes_with_device_loc
+
+      # @return (Boolean) Contains On Demand Resources
+      # @example false
       attr_accessor :contains_odr
 
-      # e.g. "13A340"
-      attr_accessor :build_sdk
+      # @return (Integer) Number of Asset packs
+      # @example 0
+      attr_accessor :number_of_asset_packs
 
-      # @return [String] e.g. "MyApp.ipa"
-      attr_accessor :file_name
+      # @return (Boolean) Includes Symbols
+      # @example true
+      attr_accessor :include_symbols
+
+      # @return (Boolean) App Uses Non-Exempt Encryption (Optional)
+      # @example null
+      attr_accessor :use_encryption_in_plist
+
+      # @return (Boolean) App Encryption Export Compliance Code (Optional)
+      # @example null
+      attr_accessor :export_compliance_code_value_in_plist
+
+      # @return (Boolean) Includes Stickers
+      # @example false
+      attr_accessor :has_stickers
+
+      # @return (Boolean) Includes iMessage App
+      # @example false
+      attr_accessor :has_messages_extension
+
+      # @return (Boolean) // Not sure what this is for
+      # @example false
+      attr_accessor :launch_prohibited
+
+      # @return (Boolean) Uses SiriKit
+      # @example false
+      attr_accessor :uses_synapse
+
+      # @return (Boolean) App uses Location Services
+      # @example false
+      attr_accessor :uses_location_background_mode
+
+      # @return (String) Link to the dSYM file (not always available)
+      # @example build/***.****.*****.*****-1.0.0-2647.dSYM.zip
+      attr_accessor :dsym_url
+
+      # @return (Boolean) Watch-Only App
+      # @example false
+      attr_accessor :watch_only
 
       attr_mapping(
         'apple_id' => :apple_id,
-        'dsymurl' => :dsym_url,
-        'includesSymbols' => :include_symbols,
-        'numberOfAssetPacks' => :number_of_asset_packs,
-        'containsODR' => :contains_odr,
+        'uploadDate' => :upload_date,
+        'binaryState' => :binary_state,
+        'fileName' => :file_name,
         'buildSdk' => :build_sdk,
-        'fileName' => :file_name
+        'buildPlatform' => :build_platform,
+        'bundleId' => :bundle_id,
+        'appName' => :app_name,
+        'supportedArchitectures' => :supported_architectures,
+        'localizations' => :localizations,
+        'newsstandApp' => :newsstand_app,
+        'prerenderedIconFlag' => :prerendered_icon_flag,
+        'entitlements' => :entitlements,
+        'appPlatform' => :app_platform,
+        'deviceProtocols' => :device_protocols,
+        'cfBundleVersion' => :cf_bundle_version,
+        'cfBundleShortVersion' => :cf_bundle_short_version,
+        'minOsVersion' => :min_os_version,
+        'deviceFamilies' => :device_families,
+        'capabilities' => :capabilities,
+        'sizeInBytes' => :size_in_bytes,
+        'sizesInBytes' => :sizes_in_bytes,
+        'sizesInBytesWithDeviceLoc' => :sizes_in_bytes_with_device_loc,
+        'containsODR' => :contains_odr,
+        'numberOfAssetPacks' => :number_of_asset_packs,
+        'includesSymbols' => :include_symbols,
+        'useEncryptionInPlist' => :use_encryption_in_plist,
+        'exportComplianceCodeValueInPlist' => :export_compliance_code_value_in_plist,
+        'hasStickers' => :has_stickers,
+        'hasMessagesExtension' => :has_messages_extension,
+        'launchProhibited' => :launch_prohibited,
+        'usesSynapse' => :uses_synapse,
+        'usesLocationBackgroundMode' => :uses_location_background_mode,
+        'dsymurl' => :dsym_url,
+        'watchOnly' => :watch_only
       )
     end
   end

data/spaceship/lib/spaceship/tunes/display_family.rb

@@ -5,7 +5,7 @@ module Spaceship
     # A definition of different styled displays used by devices
     # that App Store Connect supports storing screenshots.
     # Display styles often only vary based on screen resolution
-    # however other aspects of a displays physical apperance are
+    # however other aspects of a displays physical appearance are
     # also factored (i.e if the home indicator is provided via
     # a hardware button or a software interface).
     class DisplayFamily
@@ -15,12 +15,12 @@ module Spaceship
       # Spaceship::Tunes::AppScreenshot#device_type attribute.
       attr_accessor :name
 
-      # The user friendly name of this defintion.
+      # The user friendly name of this definition.
       #
       # Source: Media Manager in App Store Connect.
       attr_accessor :friendly_name
 
-      # The user friendly category for this defintion (i.e iPhone,
+      # The user friendly category for this definition (i.e iPhone,
       # Apple TV or Desktop).
       attr_accessor :friendly_category_name
 

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

@@ -65,6 +65,7 @@ module Spaceship
                   reference_name: nil,
                   product_id: nil,
                   cleared_for_sale: true,
+                  merch_screenshot: nil,
                   review_notes: nil,
                   review_screenshot: nil,
                   pricing_intervals: nil,
@@ -78,6 +79,7 @@ module Spaceship
                            reference_name: reference_name,
                            product_id: product_id,
                            cleared_for_sale: cleared_for_sale,
+                           merch_screenshot: merch_screenshot,
                            review_notes: review_notes,
                            review_screenshot: review_screenshot,
                            pricing_intervals: pricing_intervals,

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

@@ -30,6 +30,10 @@ module Spaceship
       # @return (Bool) Cleared for sale flag
       attr_accessor :cleared_for_sale
 
+      # @return (Hash) app store promotion image (optional)
+      attr_accessor :merch_screenshot
+
+      # @return (Hash) app review screenshot (required)
       attr_accessor :review_screenshot
 
       # @return (String) the notes for the review team
@@ -142,6 +146,12 @@ module Spaceship
         Tunes::IAPStatus.get_from_string(raw_data["versions"].first["status"])
       end
 
+      # @return (Hash) Hash containing existing promotional image data
+      def merch_screenshot
+        return nil unless raw_data && raw_data["versions"] && raw_data["versions"].first && raw_data["versions"].first["merch"] && raw_data["versions"].first["merch"]["images"].first["image"]["value"]
+        raw_data["versions"].first["merch"]["images"].first["image"]["value"]
+      end
+
       # @return (Hash) Hash containing existing review screenshot data
       def review_screenshot
         return nil unless raw_data && raw_data["versions"] && raw_data["versions"].first && raw_data["versions"].first["reviewScreenshot"] && raw_data['versions'].first["reviewScreenshot"]["value"]
@@ -172,6 +182,13 @@ module Spaceship
         raw_data.set(["pricingIntervals"], raw_pricing_intervals)
         @raw_pricing_data["subscriptions"] = raw_pricing_intervals if @raw_pricing_data
 
+        if @merch_screenshot
+          # Upload App Store Promotional image (Optional)
+          upload_file = UploadFile.from_path(@merch_screenshot)
+          merch_data = client.upload_purchase_merch_screenshot(application.apple_id, upload_file)
+          raw_data["versions"][0]["merch"] = merch_data
+        end
+
         if @review_screenshot
           # Upload Screenshot
           upload_file = UploadFile.from_path(@review_screenshot)