fastlane 2.183.1 → 2.185.1

data/sigh/lib/sigh/runner.rb

@@ -17,9 +17,11 @@ module Sigh
                                          hide_keys: [:output_path],
                                              title: "Summary for sigh #{Fastlane::VERSION}")
 
-      if api_token
+      if (api_token = Spaceship::ConnectAPI::Token.from(hash: Sigh.config[:api_key], filepath: Sigh.config[:api_key_path]))
         UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
+      elsif !Spaceship::ConnectAPI.token.nil?
+        UI.message("Using existing authorization token for App Store Connect API")
       else
         # Username is now optional since addition of App Store Connect API Key
         # Force asking for username to prompt user if not already set
@@ -63,12 +65,6 @@ module Sigh
       return download_profile(profile)
     end
 
-    def api_token
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**Sigh.config[:api_key]) if Sigh.config[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(Sigh.config[:api_key_path]) if Sigh.config[:api_key_path]
-      return @api_token
-    end
-
     # The kind of provisioning profile we're interested in
     def profile_type
       return @profile_type if @profile_type
@@ -286,7 +282,7 @@ module Sigh
                          [Spaceship::ConnectAPI::Device::DeviceClass::MAC]
                        end
 
-      if api_token
+      if Spaceship::ConnectAPI.token
         return Spaceship::ConnectAPI::Device.all.select do |device|
           device_classes.include?(device.device_class)
         end

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -69,7 +69,7 @@ module Snapshot
         # Check each device to see if it is an iOS device
         all_ios = devices.map do |device|
           device = device.downcase
-          device.include?('iphone') || device.include?('ipad')
+          device.include?('iphone') || device.include?('ipad') || device.include?('ipod')
         end
         # Return true if all devices are iOS devices
         return true unless all_ios.include?(false)

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

@@ -6,23 +6,29 @@ module Spaceship
 
       # Rating
       attr_accessor :alcohol_tobacco_or_drug_use_or_references
+      attr_accessor :contests
       attr_accessor :gambling_simulated
       attr_accessor :medical_or_treatment_information
       attr_accessor :profanity_or_crude_humor
       attr_accessor :sexual_content_graphic_and_nudity
+      attr_accessor :sexual_content_or_nudity
       attr_accessor :horror_or_fear_themes
       attr_accessor :mature_or_suggestive_themes
       attr_accessor :violence_cartoon_or_fantasy
       attr_accessor :violence_realistic_prolonged_graphic_or_sadistic
       attr_accessor :violence_realistic
 
-      # boolean
-      attr_accessor :gambling_and_contests
+      # Boolean
+      attr_accessor :gambling
+      attr_accessor :seventeen_plus
       attr_accessor :unrestricted_web_access
 
       # KidsAge
       attr_accessor :kids_age_band
 
+      # Deprecated as of App Store Connect API 1.3
+      attr_accessor :gambling_and_contests
+
       module Rating
         NONE = "NONE"
         INFREQUENT_OR_MILD = "INFREQUENT_OR_MILD"
@@ -37,10 +43,12 @@ module Spaceship
 
       attr_mapping({
         "alcoholTobaccoOrDrugUseOrReferences" => "alcohol_tobacco_or_drug_use_or_references",
-        "gamblingAndContests" => "gambling_and_contests",
+        "contests" => "contests",
+        "gambling" => "gambling",
         "gamblingSimulated" => "gambling_simulated",
         "medicalOrTreatmentInformation" => "medical_or_treatment_information",
         "profanityOrCrudeHumor" => "profanity_or_crude_humor",
+        "seventeenPlus" => "seventeen_plus",
         "sexualContentGraphicAndNudity" => "sexual_content_graphic_and_nudity",
         "sexualContentOrNudity" => "sexual_content_or_nudity",
         "horrorOrFearThemes" => "horror_or_fear_themes",
@@ -49,7 +57,10 @@ module Spaceship
         "violenceCartoonOrFantasy" => "violence_cartoon_or_fantasy",
         "violenceRealisticProlongedGraphicOrSadistic" => "violence_realistic_prolonged_graphic_or_sadistic",
         "violenceRealistic" => "violence_realistic",
-        "kidsAgeBand" => "kids_age_band"
+        "kidsAgeBand" => "kids_age_band",
+
+        # Deprecated as of App Store Connect API 1.3
+        "gamblingAndContests" => "gambling_and_contests",
       })
 
       def self.type
@@ -83,6 +94,27 @@ module Spaceship
         1 => true
       }
 
+      def self.map_deprecation_if_possible(attributes)
+        attributes = attributes.dup
+        messages = []
+        errors = []
+
+        value = attributes.delete('gamblingAndContests')
+        return attributes, messages, errors if value.nil?
+
+        messages << "Age Rating 'gamblingAndContests' has been deprecated and split into 'gambling' and 'contests'"
+
+        attributes['gambling'] = value
+        if value == true
+          errors << "'gamblingAndContests' could not be mapped to 'contests' - 'contests' requires a value of 'NONE', 'INFREQUENT_OR_MILD', or 'FREQUENT_OR_INTENSE'"
+          attributes['contests'] = value
+        else
+          attributes['contests'] = 'NONE'
+        end
+
+        return attributes, messages, errors
+      end
+
       def self.map_key_from_itc(key)
         key = key.gsub("MZGenre.", "")
         return nil if key.empty?

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

@@ -81,6 +81,16 @@ module Spaceship
         client.delete_app_info(app_info_id: id)
       end
 
+      #
+      # Age Rating Declaration
+      #
+
+      def fetch_age_rating_declaration(client: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_age_rating_declaration(app_info_id: id)
+        return resp.to_models.first
+      end
+
       #
       # App Info Localizations
       #

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

@@ -110,10 +110,9 @@ module Spaceship
       # Age Rating Declaration
       #
 
+      # @deprecated
       def fetch_age_rating_declaration(client: nil)
-        client ||= Spaceship::ConnectAPI
-        resp = client.get_age_rating_declaration(app_store_version_id: id)
-        return resp.to_models.first
+        raise 'AppStoreVersion no longer as AgeRatingDelcaration as of App Store Connect API 1.3 - Use AppInfo instead'
       end
 
       #

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

@@ -12,6 +12,7 @@ module Spaceship
       attr_accessor :public_link_limit_enabled
       attr_accessor :public_link_limit
       attr_accessor :public_link
+      attr_accessor :beta_testers
 
       attr_mapping({
         "name" => "name",
@@ -21,7 +22,8 @@ module Spaceship
         "publicLinkId" => "public_link_id",
         "publicLinkLimitEnabled" => "public_link_limit_enabled",
         "publicLinkLimit" => "public_link_limit",
-        "publicLink" => "public_link"
+        "publicLink" => "public_link",
+        "betaTesters" => "beta_testers"
       })
 
       def self.type

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

@@ -17,6 +17,7 @@ module Spaceship
       attr_accessor :app
       attr_accessor :beta_app_review_submission
       attr_accessor :beta_build_metrics
+      attr_accessor :beta_build_localizations
       attr_accessor :build_beta_detail
       attr_accessor :pre_release_version
 
@@ -33,6 +34,7 @@ module Spaceship
         "app" => "app",
         "betaAppReviewSubmission" => "beta_app_review_submission",
         "betaBuildMetrics" => "beta_build_metrics",
+        "betaBuildLocalizations" => "beta_build_localizations",
         "buildBetaDetail" => "build_beta_detail",
         "preReleaseVersion" => "pre_release_version"
       })

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

@@ -25,6 +25,12 @@ module Spaceship
       # key is for App Store or Enterprise so this is the temporary workaround
       attr_accessor :in_house
 
+      def self.from(hash: nil, filepath: nil)
+        api_token ||= self.create(**hash) if hash
+        api_token ||= self.from_json_file(filepath) if filepath
+        return api_token
+      end
+
       def self.from_json_file(filepath)
         json = JSON.parse(File.read(filepath), { symbolize_names: true })
 

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

@@ -17,9 +17,11 @@ module Spaceship
         # ageRatingDeclarations
         #
 
-        def get_age_rating_declaration(app_store_version_id: nil)
+        def get_age_rating_declaration(app_info_id: nil, app_store_version_id: nil)
+          raise "Keyword 'app_store_version_id' is deprecated and 'app_info_id' is required" if app_store_version_id || app_info_id.nil?
+
           params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-          tunes_request_client.get("appStoreVersions/#{app_store_version_id}/ageRatingDeclaration", params)
+          tunes_request_client.get("appInfos/#{app_info_id}/ageRatingDeclaration", params)
         end
 
         def patch_age_rating_declaration(age_rating_declaration_id: nil, attributes: nil)

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -39,12 +39,7 @@ module Spaceship
       # Example:
       # name: DES5c148586daa451e55afb017aa62418f91
       # value: HSARMTKNSRVTWFlaF/ek8asaa9lymMA0dN8JQ6pY7B3F5kdqTxJvMT19EVEFX8EQudB/uNwBHOHzaa30KYTU/eCP/UF7vGTgxs6PAnlVWKscWssOVHfP2IKWUPaa4Dn+I6ilA7eAFQsiaaVT
-      cookies = YAML.safe_load(
-        itc_cookie_content,
-        [HTTP::Cookie, Time], # classes allowlist
-        [],                   # symbols allowlist
-        true                  # allow YAML aliases
-      )
+      cookies = load_cookies(itc_cookie_content)
 
       # We remove all the un-needed cookies
       cookies.select! do |cookie|
@@ -72,6 +67,24 @@ module Spaceship
       return self
     end
 
+    def load_cookies(content)
+      # When Ruby 2.5 support is dropped, we can safely get rid of the latter branch.
+      if YAML.name == 'Psych' && Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1')
+        YAML.safe_load(
+          content,
+          permitted_classes: [HTTP::Cookie, Time],
+          aliases: true
+        )
+      else
+        YAML.safe_load(
+          content,
+          [HTTP::Cookie, Time], # classes allowlist
+          [],                   # symbols allowlist
+          true                  # allow YAML aliases
+        )
+      end
+    end
+
     def session_string
       FastlaneCore::UI.user_error!("`#{__method__}` method called before calling `run` in `SpaceauthRunner`") unless @yaml
       @yaml

data/supply/lib/supply/client.rb

@@ -279,13 +279,13 @@ 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,
         short_description: short_description,
         video: video
-      })
+      )
 
       call_google_api do
         client.update_edit_listing(

data/supply/lib/supply/uploader.rb

@@ -233,10 +233,10 @@ module Supply
         end
       end
 
-      AndroidPublisher::LocalizedText.new({
+      AndroidPublisher::LocalizedText.new(
         language: language,
         text: changelog_text
-      })
+      )
     end
 
     def upload_changelogs(release_notes, release, track)

metadata

@@ -1,37 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.183.1
+  version: 2.185.1
 platform: ruby
 authors:
-- Satoshi Namai
-- Andrew McBurney
-- Maksym Grebenets
-- Helmut Januschka
-- Kohki Miki
-- Roger Oba
 - Jimmy Dee
-- Aaron Brager
 - Jorge Revuelta H
-- Jérôme Lacoste
+- Maksym Grebenets
+- Aaron Brager
+- Jan Piotrowski
 - Joshua Liebowitz
-- Max Ott
-- Felix Krause
-- Stefan Natchev
-- Manu Wallner
+- Helmut Januschka
+- Manish Rathi
 - Fumiya Nakamura
-- Danielle Tomlinson
-- Luka Mirosevic
-- Josh Holtz
-- Daniel Jankowski
 - Olivier Halligon
+- Josh Holtz
+- Felix Krause
 - Iulian Onofrei
-- Jan Piotrowski
 - Matthew Ellis
+- Manu Wallner
+- Jérôme Lacoste
+- Kohki Miki
+- Roger Oba
+- Stefan Natchev
+- Luka Mirosevic
+- Satoshi Namai
+- Andrew McBurney
+- Max Ott
+- Danielle Tomlinson
+- Daniel Jankowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1813,9 +1814,6 @@ files:
 - spaceship/lib/spaceship/upgrade_2fa_later_client.rb
 - supply/README.md
 - supply/lib/supply.rb
-- supply/lib/supply/.client.rb.swp
-- supply/lib/supply/.listing.rb.swp
-- supply/lib/supply/.uploader.rb.swp
 - supply/lib/supply/apk_listing.rb
 - supply/lib/supply/client.rb
 - supply/lib/supply/commands_generator.rb