fastlane 2.129.0 → 2.134.0

data/sigh/lib/sigh/runner.rb

@@ -155,27 +155,35 @@ module Sigh
       case Sigh.config[:platform].to_s
       when 'ios', 'tvos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.development.all
+          certificates = Spaceship.certificate.development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.InHouse
+          # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         # handles case where the desired certificate type is adhoc but the account is an enterprise account
         # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
         # for enterprise accounts, you get nothing back even if they exist.
         elsif profile_type == Spaceship.provisioning_profile.AdHoc && Spaceship.client && Spaceship.client.in_house?
+          # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         else
-          certificates = Spaceship.certificate.production.all # Ad hoc or App Store
+          # Ad hoc or App Store
+          certificates = Spaceship.certificate.production.all +
+                         Spaceship.certificate.apple_distribution.all
         end
 
       when 'macos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.mac_development.all
+          certificates = Spaceship.certificate.mac_development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.AppStore
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         elsif profile_type == Spaceship.provisioning_profile.Direct
           certificates = Spaceship.certificate.developer_id_application.all
         else
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         end
       end
 

data/snapshot/lib/snapshot/commands_generator.rb

@@ -56,10 +56,10 @@ module Snapshot
       command :update do |c|
         c.syntax = 'fastlane snapshot update'
         c.description = "Updates your SnapshotHelper.swift to the latest version"
-
+        c.option('--force', 'Disables confirmation prompts')
         c.action do |args, options|
           require 'snapshot/update'
-          Snapshot::Update.new.update
+          Snapshot::Update.new.update(force: options.force)
         end
       end
 

data/snapshot/lib/snapshot/options.rb

@@ -116,6 +116,11 @@ module Snapshot
                                      description: "Enabling this option will configure the Simulator's system language",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :dark_mode,
+                                    env_name: 'SNAPSHOT_DARK_MODE',
+                                    description: "Enabling this option will configure the Simulator to be in dark mode (false for light, true for dark)",
+                                    optional: true,
+                                    type: Boolean),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      env_name: 'SNAPSHOT_APP_IDENTIFIER',
                                      short_option: "-a",

data/snapshot/lib/snapshot/reports_generator.rb

@@ -77,6 +77,9 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 11 Pro Max' => "iPhone 11 Pro Max",
+        'iPhone 11 Pro' => "iPhone 11 Pro",
+        'iPhone 11' => "iPhone 11",
         'iPhone XS Max' => "iPhone XS Max",
         'iPhone XS' => "iPhone XS",
         'iPhone XR' => "iPhone XR",

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -8,6 +8,7 @@ module Snapshot
     attr_accessor :clean
     attr_accessor :erase_simulator
     attr_accessor :localize_simulator
+    attr_accessor :dark_mode
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
 
@@ -32,6 +33,7 @@ module Snapshot
       @clean = snapshot_config[:clean]
       @erase_simulator = snapshot_config[:erase_simulator]
       @localize_simulator = snapshot_config[:localize_simulator]
+      @dark_mode = snapshot_config[:dark_mode]
       @reinstall_app = snapshot_config[:reinstall_app]
       @app_identifier = snapshot_config[:app_identifier]
       @number_of_retries = snapshot_config[:number_of_retries]

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

@@ -190,7 +190,7 @@ module Snapshot
           hash[name] = ["No tests were executed"]
         else
           tests = Array(summary.data.first[:tests])
-          hash[name] = tests.map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }.flatten
+          hash[name] = tests.flat_map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }
         end
       end
     end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -55,11 +55,14 @@ module Snapshot
       Fixes::HardwareKeyboardFix.patch
 
       device_types.each do |type|
-        if launcher_config.erase_simulator || launcher_config.localize_simulator
+        if launcher_config.erase_simulator || launcher_config.localize_simulator || !launcher_config.dark_mode.nil?
           erase_simulator(type)
           if launcher_config.localize_simulator
             localize_simulator(type, language, locale)
           end
+          unless launcher_config.dark_mode.nil?
+            interface_style(type, launcher_config.dark_mode)
+          end
         elsif launcher_config.reinstall_app
           # no need to reinstall if device has been erased
           uninstall_app(type)
@@ -124,6 +127,18 @@ module Snapshot
       end
     end
 
+    def interface_style(device_type, dark_mode)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        plist = {
+          UserInterfaceStyleMode: (dark_mode ? 2 : 1)
+        }
+        UI.message("Setting interface style #{device_type} (UserInterfaceStyleMode=#{dark_mode})")
+        plist_path = "#{ENV['HOME']}/Library/Developer/CoreSimulator/Devices/#{device_udid}/data/Library/Preferences/com.apple.uikitservices.userInterfaceStyleMode.plist"
+        File.write(plist_path, Plist::Emit.dump(plist))
+      end
+    end
+
     def copy_simulator_logs(device_names, language, locale, launch_arguments)
       return unless launcher_config.output_simulator_logs
 

data/snapshot/lib/snapshot/update.rb

@@ -11,7 +11,7 @@ module Snapshot
       paths.reject { |p| p.include?("snapshot/lib/assets/") }
     end
 
-    def update
+    def update(force: false)
       paths = self.class.find_helper
       UI.user_error!("Couldn't find any SnapshotHelper files in current directory") if paths.count == 0
 
@@ -22,7 +22,9 @@ module Snapshot
       UI.message("The underlying API will not change. You can always migrate manually by looking at")
       UI.message("https://github.com/fastlane/fastlane/blob/master/snapshot/lib/assets/SnapshotHelper.swift")
 
-      return 1 unless UI.confirm("Overwrite configuration files?")
+      if !force && !UI.confirm("Overwrite configuration files?")
+        return 1
+      end
 
       paths.each do |path|
         UI.message("Updating '#{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
@@ -738,7 +738,7 @@ module Spaceship
         raise InternalServerError, "Received an internal server error from App Store Connect / Developer Portal, please try again later"
       elsif body.to_s.include?("Gateway Timeout - In read")
         raise GatewayTimeoutError, "Received a gateway timeout error from App Store Connect / Developer Portal, please try again later"
-      elsif (body["resultString"] || "").include?("Program License Agreement")
+      elsif (body["userString"] || "").include?("Program License Agreement")
         raise ProgramLicenseAgreementUpdated, "#{body['userString']} Please manually log into your Apple Developer account to review and accept the updated agreement."
       end
     end

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/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