fastlane 2.188.0 → 2.192.0

data/spaceship/lib/spaceship/connect_api/token.rb

@@ -13,6 +13,7 @@ module Spaceship
     class Token
       # maximum expiration supported by AppStore (20 minutes)
       MAX_TOKEN_DURATION = 1200
+      DEFAULT_TOKEN_DURATION = 500
 
       attr_reader :key_id
       attr_reader :issuer_id
@@ -20,6 +21,8 @@ module Spaceship
       attr_reader :duration
       attr_reader :expiration
 
+      attr_reader :key_raw
+
       # Temporary attribute not needed to create the JWT text
       # There is no way to determine if the team associated with this
       # key is for App Store or Enterprise so this is the temporary workaround
@@ -80,7 +83,7 @@ module Spaceship
         @duration = duration
         @in_house = in_house
 
-        @duration ||= MAX_TOKEN_DURATION
+        @duration ||= DEFAULT_TOKEN_DURATION
         @duration = @duration.to_i if @duration
 
         refresh!

data/spaceship/lib/spaceship/connect_api/tunes/client.rb

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::Tunes::API)
           self.tunes_request_client = self
         end

data/spaceship/lib/spaceship/connect_api/users/client.rb

@@ -11,6 +11,9 @@ module Spaceship
 
           super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
+          # Used by most iris requests starting in July 2021
+          @additional_headers = { 'x-csrf-itc': '[asc-ui]' } if another_client
+
           self.extend(Spaceship::ConnectAPI::Users::API)
           self.users_request_client = self
         end

data/spaceship/lib/spaceship/connect_api/users/users.rb

@@ -28,8 +28,13 @@ module Spaceship
           users_request_client.delete("users/#{user_id}")
         end
 
-        # Change app permissions for user
+        # Add app permissions for user
+        # @deprecated Use {#post_user_visible_apps} instead.
         def add_user_visible_apps(user_id: nil, app_ids: nil)
+          post_user_visible_apps(user_id: user_id, app_ids: app_ids)
+        end
+
+        def post_user_visible_apps(user_id: nil, app_ids: nil)
           body = {
             data: app_ids.map do |app_id|
               {
@@ -42,18 +47,52 @@ module Spaceship
           users_request_client.post("users/#{user_id}/relationships/visibleApps", body)
         end
 
+        # Replace app permissions for user
+        def patch_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+
+          users_request_client.patch("users/#{user_id}/relationships/visibleApps", body)
+        end
+
+        # Remove app permissions for user
+        def delete_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
+          params = nil
+          users_request_client.delete("users/#{user_id}/relationships/visibleApps", params, body)
+        end
+
+        # Get app permissions for user
+        def get_user_visible_apps(user_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("users/#{user_id}/visibleApps", params)
+        end
+
         #
         # invitations (invited users)
         #
 
-        # Get all invited users (not yet accepted)
+        # Get all invited users
         def get_user_invitations(filter: {}, includes: nil, limit: nil, sort: nil)
           params = users_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
           users_request_client.get("userInvitations", params)
         end
 
         # Invite new users to App Store Connect
-        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil)
+        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil, visible_app_ids: [])
           body = {
             data: {
               type: "userInvitations",
@@ -64,6 +103,16 @@ module Spaceship
                 roles: roles,
                 provisioningAllowed: provisioning_allowed,
                 allAppsVisible: all_apps_visible
+              },
+              relationships: {
+                visibleApps: {
+                  data: visible_app_ids.map do |id|
+                    {
+                      id: id,
+                      type: "apps"
+                    }
+                  end
+                }
               }
             }
           }
@@ -74,6 +123,12 @@ module Spaceship
         def delete_user_invitation(user_invitation_id: nil)
           users_request_client.delete("userInvitations/#{user_invitation_id}")
         end
+
+        # Get all app permissions for invited user
+        def get_user_invitation_visible_apps(user_invitation_id: id, limit: nil)
+          params = users_request_client.build_params(filter: {}, includes: nil, limit: limit, sort: nil)
+          users_request_client.get("userInvitations/#{user_invitation_id}/visibleApps", params)
+        end
       end
     end
   end

data/spaceship/lib/spaceship/connect_api.rb

@@ -10,6 +10,7 @@ require 'spaceship/connect_api/tunes/tunes'
 
 require 'spaceship/connect_api/models/bundle_id_capability'
 require 'spaceship/connect_api/models/bundle_id'
+require 'spaceship/connect_api/models/capabilities'
 require 'spaceship/connect_api/models/certificate'
 require 'spaceship/connect_api/models/device'
 require 'spaceship/connect_api/models/profile'

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

@@ -24,6 +24,9 @@ module Spaceship
       super
 
       @du_client = DUClient.new
+
+      # Used by most WebObjects requests starting in July 2021
+      @additional_headers = { 'x-csrf-itc': 'itc' }
     end
 
     class << self

data/supply/lib/supply/client.rb

@@ -162,7 +162,46 @@ module Supply
     def commit_current_edit!
       ensure_active_edit!
 
-      call_google_api { client.commit_edit(current_package_name, current_edit.id) }
+      call_google_api do
+        begin
+          client.commit_edit(
+            current_package_name,
+            current_edit.id,
+            changes_not_sent_for_review: Supply.config[:changes_not_sent_for_review]
+          )
+        rescue Google::Apis::ClientError => e
+          unless Supply.config[:rescue_changes_not_sent_for_review]
+            raise
+          end
+
+          error = begin
+                    JSON.parse(e.body)
+                  rescue
+                    nil
+                  end
+
+          if error
+            message = error["error"] && error["error"]["message"]
+          else
+            message = e.body
+          end
+
+          if message.include?("The query parameter changesNotSentForReview must not be set")
+            client.commit_edit(
+              current_package_name,
+              current_edit.id
+            )
+          elsif message.include?("Please set the query parameter changesNotSentForReview to true")
+            client.commit_edit(
+              current_package_name,
+              current_edit.id,
+              changes_not_sent_for_review: true
+            )
+          else
+            raise
+          end
+        end
+      end
 
       self.current_edit = nil
       self.current_package_name = nil

data/supply/lib/supply/options.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Metrics/ClassLength
+
 require 'fastlane_core/configuration/config_item'
 require 'credentials_manager/appfile_config'
 
@@ -281,6 +283,16 @@ module Supply
                                          UI.user_error!("Version code '#{version_code}' is not an integer") if version_code == 0
                                        end
                                      end),
+        FastlaneCore::ConfigItem.new(key: :changes_not_sent_for_review,
+                                     env_name: "SUPPLY_CHANGES_NOT_SENT_FOR_REVIEW",
+                                     description: "Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Google Play Console UI",
+                                     type: Boolean,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :rescue_changes_not_sent_for_review,
+                                     env_name: "SUPPLY_RESCUE_CHANGES_NOT_SENT_FOR_REVIEW",
+                                     description: "Catches changes_not_sent_for_review errors when an edit is committed and retries with the configuration that the error message recommended",
+                                     type: Boolean,
+                                     default_value: true),
         FastlaneCore::ConfigItem.new(key: :in_app_update_priority,
                                      env_name: "SUPPLY_IN_APP_UPDATE_PRIORITY",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -302,7 +302,7 @@ module Supply
 
     def upload_mapping(apk_version_codes)
       mapping_paths = [Supply.config[:mapping]] unless (mapping_paths = Supply.config[:mapping_paths])
-      mapping_paths.zip(apk_version_codes).each do |mapping_path, version_code|
+      mapping_paths.product(apk_version_codes).each do |mapping_path, version_code|
         if mapping_path
           UI.message("Preparing mapping at path '#{mapping_path}', version code #{version_code} for upload...")
           client.upload_mapping(mapping_path, version_code)

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.188.0
+  version: 2.192.0
 platform: ruby
 authors:
-- Roger Oba
+- Jan Piotrowski
+- Manu Wallner
+- Jérôme Lacoste
+- Helmut Januschka
+- Daniel Jankowski
+- Satoshi Namai
 - Joshua Liebowitz
-- Jorge Revuelta H
-- Felix Krause
+- Roger Oba
 - Josh Holtz
-- Andrew McBurney
-- Maksym Grebenets
 - Matthew Ellis
-- Max Ott
+- Andrew McBurney
+- Aaron Brager
+- Stefan Natchev
 - Manish Rathi
-- Kohki Miki
+- Felix Krause
+- Jorge Revuelta H
+- Max Ott
+- Maksym Grebenets
+- Iulian Onofrei
 - Olivier Halligon
-- Stefan Natchev
-- Satoshi Namai
-- Fumiya Nakamura
-- Luka Mirosevic
-- Aaron Brager
 - Jimmy Dee
-- Manu Wallner
 - Danielle Tomlinson
-- Daniel Jankowski
-- Helmut Januschka
-- Jan Piotrowski
-- Iulian Onofrei
-- Jérôme Lacoste
+- Kohki Miki
+- Fumiya Nakamura
+- Luka Mirosevic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -196,6 +196,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: optparse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -604,14 +618,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -971,8 +985,10 @@ files:
 - deliver/lib/deliver/module.rb
 - deliver/lib/deliver/options.rb
 - deliver/lib/deliver/runner.rb
+- deliver/lib/deliver/screenshot_comparable.rb
 - deliver/lib/deliver/setup.rb
 - deliver/lib/deliver/submit_for_review.rb
+- deliver/lib/deliver/sync_screenshots.rb
 - deliver/lib/deliver/upload_metadata.rb
 - deliver/lib/deliver/upload_price_tier.rb
 - deliver/lib/deliver/upload_screenshots.rb
@@ -1640,7 +1656,6 @@ files:
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
-- spaceship/lib/spaceship/connect_api/models/.bundle_id.rb.swp
 - spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
 - spaceship/lib/spaceship/connect_api/models/app_category.rb
@@ -1681,6 +1696,7 @@ files:
 - spaceship/lib/spaceship/connect_api/models/build_delivery.rb
 - spaceship/lib/spaceship/connect_api/models/bundle_id.rb
 - spaceship/lib/spaceship/connect_api/models/bundle_id_capability.rb
+- spaceship/lib/spaceship/connect_api/models/capabilities.rb
 - spaceship/lib/spaceship/connect_api/models/certificate.rb
 - spaceship/lib/spaceship/connect_api/models/custom_app_organization.rb
 - spaceship/lib/spaceship/connect_api/models/custom_app_user.rb
@@ -1697,6 +1713,7 @@ files:
 - spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb
 - spaceship/lib/spaceship/connect_api/response.rb
 - spaceship/lib/spaceship/connect_api/spaceship.rb
+- spaceship/lib/spaceship/connect_api/testflight/.testflight.rb.swp
 - spaceship/lib/spaceship/connect_api/testflight/client.rb
 - spaceship/lib/spaceship/connect_api/testflight/testflight.rb
 - spaceship/lib/spaceship/connect_api/token.rb
@@ -1716,7 +1733,6 @@ files:
 - spaceship/lib/spaceship/launcher.rb
 - spaceship/lib/spaceship/module.rb
 - spaceship/lib/spaceship/playground.rb
-- spaceship/lib/spaceship/portal/.app.rb.swp
 - spaceship/lib/spaceship/portal/app.rb
 - spaceship/lib/spaceship/portal/app_group.rb
 - spaceship/lib/spaceship/portal/app_service.rb
@@ -1858,7 +1874,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and