fastlane 2.157.0 → 2.158.0

data/fastlane/lib/fastlane/actions/set_changelog.rb

@@ -4,9 +4,10 @@ module Fastlane
       def self.run(params)
         require 'spaceship'
 
+        # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+        # Prompts select team if multiple teams and none specified
         UI.message("Login to App Store Connect (#{params[:username]})")
-        Spaceship::ConnectAPI.login(params[:username])
-        Spaceship::ConnectAPI.select_team
+        Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true)
         UI.message("Login successful")
 
         app = Spaceship::ConnectAPI::App.find(params[:app_identifier])

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.157.0'.freeze
+  VERSION = '2.158.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -14,4 +14,4 @@ class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -245,4 +245,4 @@ extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.35]
+// FastlaneRunnerAPIVersion [0.9.40]

data/fastlane/swift/Fastlane.swift

@@ -1952,6 +1952,7 @@ func chatwork(apiToken: String,
    - username: Your Apple ID Username
    - teamId: The ID of your App Store Connect team if you're in multiple teams
    - teamName: The name of your App Store Connect team if you're in multiple teams
+   - platform: The platform to use (optional)
    - defaultRuleLevel: The default rule level unless otherwise configured
    - includeInAppPurchases: Should check in-app purchases?
    - negativeAppleSentiment: mentioning  in a way that could be considered negative
@@ -1973,6 +1974,7 @@ func checkAppStoreMetadata(appIdentifier: String,
                            username: String,
                            teamId: String? = nil,
                            teamName: String? = nil,
+                           platform: String = "ios",
                            defaultRuleLevel: Any = "error",
                            includeInAppPurchases: Bool = true,
                            negativeAppleSentiment: Any? = nil,
@@ -1990,6 +1992,7 @@ func checkAppStoreMetadata(appIdentifier: String,
                                                                                                             RubyCommand.Argument(name: "username", value: username),
                                                                                                             RubyCommand.Argument(name: "team_id", value: teamId),
                                                                                                             RubyCommand.Argument(name: "team_name", value: teamName),
+                                                                                                            RubyCommand.Argument(name: "platform", value: platform),
                                                                                                             RubyCommand.Argument(name: "default_rule_level", value: defaultRuleLevel),
                                                                                                             RubyCommand.Argument(name: "include_in_app_purchases", value: includeInAppPurchases),
                                                                                                             RubyCommand.Argument(name: "negative_apple_sentiment", value: negativeAppleSentiment),
@@ -2886,7 +2889,7 @@ func downloadDsyms(username: String,
 func downloadFromPlayStore(packageName: String,
                            versionName: String? = nil,
                            track: String = "production",
-                           metadataPath: String? = nil,
+                           metadataPath: String = "./metadata",
                            key: String? = nil,
                            issuer: String? = nil,
                            jsonKey: String? = nil,
@@ -5470,6 +5473,7 @@ func podioItem(clientId: String,
    - username: Your Apple ID Username
    - teamId: The ID of your App Store Connect team if you're in multiple teams
    - teamName: The name of your App Store Connect team if you're in multiple teams
+   - platform: The platform to use (optional)
    - defaultRuleLevel: The default rule level unless otherwise configured
    - includeInAppPurchases: Should check in-app purchases?
    - freeStuffInIap: using text indicating that your IAP is free
@@ -5482,6 +5486,7 @@ func precheck(appIdentifier: Any = precheckfile.appIdentifier,
               username: Any = precheckfile.username,
               teamId: Any? = precheckfile.teamId,
               teamName: Any? = precheckfile.teamName,
+              platform: Any = precheckfile.platform,
               defaultRuleLevel: Any = precheckfile.defaultRuleLevel,
               includeInAppPurchases: Bool = precheckfile.includeInAppPurchases,
               freeStuffInIap: Any? = precheckfile.freeStuffInIap)
@@ -5490,6 +5495,7 @@ func precheck(appIdentifier: Any = precheckfile.appIdentifier,
                                                                                             RubyCommand.Argument(name: "username", value: username),
                                                                                             RubyCommand.Argument(name: "team_id", value: teamId),
                                                                                             RubyCommand.Argument(name: "team_name", value: teamName),
+                                                                                            RubyCommand.Argument(name: "platform", value: platform),
                                                                                             RubyCommand.Argument(name: "default_rule_level", value: defaultRuleLevel),
                                                                                             RubyCommand.Argument(name: "include_in_app_purchases", value: includeInAppPurchases),
                                                                                             RubyCommand.Argument(name: "free_stuff_in_iap", value: freeStuffInIap)])
@@ -7431,7 +7437,7 @@ func supply(packageName: String,
             releaseStatus: String = "completed",
             track: String = "production",
             rollout: String? = nil,
-            metadataPath: String? = nil,
+            metadataPath: String = "./metadata",
             key: String? = nil,
             issuer: String? = nil,
             jsonKey: String? = nil,
@@ -8588,7 +8594,7 @@ func uploadToPlayStore(packageName: String,
                        releaseStatus: String = "completed",
                        track: String = "production",
                        rollout: String? = nil,
-                       metadataPath: String? = nil,
+                       metadataPath: String = "./metadata",
                        key: String? = nil,
                        issuer: String? = nil,
                        jsonKey: String? = nil,
@@ -9118,7 +9124,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode-12.beta.5.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false)
 {
     let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
@@ -9254,14 +9260,14 @@ func parseInt(fromString: String, function: String = #function) -> Int {
     return NSString(string: fromString.trimmingCharacters(in: .punctuationCharacters)).integerValue
 }
 
-let deliverfile: Deliverfile = Deliverfile()
-let gymfile: Gymfile = Gymfile()
-let matchfile: Matchfile = Matchfile()
-let precheckfile: Precheckfile = Precheckfile()
-let scanfile: Scanfile = Scanfile()
-let screengrabfile: Screengrabfile = Screengrabfile()
-let snapshotfile: Snapshotfile = Snapshotfile()
+let deliverfile = Deliverfile()
+let gymfile = Gymfile()
+let matchfile = Matchfile()
+let precheckfile = Precheckfile()
+let scanfile = Scanfile()
+let screengrabfile = Screengrabfile()
+let snapshotfile = Snapshotfile()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.88]
+// FastlaneRunnerAPIVersion [0.9.93]

data/fastlane/swift/Gymfile.swift

@@ -14,4 +14,4 @@ class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/GymfileProtocol.swift

@@ -181,4 +181,4 @@ extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.38]
+// FastlaneRunnerAPIVersion [0.9.43]

data/fastlane/swift/Matchfile.swift

@@ -14,4 +14,4 @@ class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -165,4 +165,4 @@ extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.32]
+// FastlaneRunnerAPIVersion [0.9.37]

data/fastlane/swift/Precheckfile.swift

@@ -14,4 +14,4 @@ class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -11,6 +11,9 @@ protocol PrecheckfileProtocol: class {
     /// The name of your App Store Connect team if you're in multiple teams
     var teamName: String? { get }
 
+    /// The platform to use (optional)
+    var platform: String { get }
+
     /// The default rule level unless otherwise configured
     var defaultRuleLevel: String { get }
 
@@ -26,6 +29,7 @@ extension PrecheckfileProtocol {
     var username: String { return "" }
     var teamId: String? { return nil }
     var teamName: String? { return nil }
+    var platform: String { return "ios" }
     var defaultRuleLevel: String { return "error" }
     var includeInAppPurchases: Bool { return true }
     var freeStuffInIap: String? { return nil }
@@ -33,4 +37,4 @@ extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.31]
+// FastlaneRunnerAPIVersion [0.9.36]

data/fastlane/swift/Scanfile.swift

@@ -14,4 +14,4 @@ class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -257,4 +257,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.43]
+// FastlaneRunnerAPIVersion [0.9.48]

data/fastlane/swift/Screengrabfile.swift

@@ -14,4 +14,4 @@ class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -93,4 +93,4 @@ extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.33]
+// FastlaneRunnerAPIVersion [0.9.38]

data/fastlane/swift/Snapshotfile.swift

@@ -14,4 +14,4 @@ class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.0
+// Generated with fastlane 2.158.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -181,4 +181,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.27]
+// FastlaneRunnerAPIVersion [0.9.32]

data/fastlane_core/lib/fastlane_core/command_executor.rb

@@ -52,6 +52,7 @@ module FastlaneCore
           status = FastlaneCore::FastlanePty.spawn(command) do |command_stdout, command_stdin, pid|
             command_stdout.each do |l|
               line = l.chomp
+              line = line[1..-1] if line[0] == "\r"
               output << line
 
               next unless print_all

data/match/lib/match/spaceship_ensure.rb

@@ -18,18 +18,18 @@ module Match
         UI.important("More information https://docs.fastlane.tools/actions/match/#access-control")
       end
 
+      # Prompts select team if multiple teams and none specified
       UI.message("Verifying that the certificate and profile are still valid on the Dev Portal...")
-      Spaceship.login(user)
-      Spaceship.select_team(team_id: team_id, team_name: team_name)
+      Spaceship::ConnectAPI.login(user, use_portal: true, use_tunes: false, portal_team_id: team_id, team_name: team_name)
     end
 
     # The team ID of the currently logged in team
     def team_id
-      return Spaceship.client.team_id
+      return Spaceship::ConnectAPI.client.portal_team_id
     end
 
     def bundle_identifier_exists(username: nil, app_identifier: nil, platform: nil)
-      found = Spaceship.app.find(app_identifier, mac: platform == "macos")
+      found = Spaceship::ConnectAPI::BundleId.find(app_identifier)
       return if found
 
       require 'sigh/runner'
@@ -39,7 +39,7 @@ module Match
       })
       UI.error("An app with that bundle ID needs to exist in order to create a provisioning profile for it")
       UI.error("================================================================")
-      available_apps = Spaceship.app.all.collect { |a| "#{a.bundle_id} (#{a.name})" }
+      available_apps = Spaceship::ConnectAPI::BundleId.all.collect { |a| "#{a.identifier} (#{a.name})" }
       UI.message("Available apps:\n- #{available_apps.join("\n- ")}")
       UI.error("Make sure to run `fastlane match` with the same user and team every time.")
       UI.user_error!("Couldn't find bundle identifier '#{app_identifier}' for the user '#{username}'")

data/pilot/lib/pilot/build_manager.rb

@@ -364,10 +364,7 @@ module Pilot
       begin
         team = tunes_client.teams.find { |t| t['contentProvider']['contentProviderId'].to_s == tunes_client.team_id }
         name = team['contentProvider']['name']
-        STDERR.puts("name: #{name}")
-        STDERR.puts("id: #{generic_transporter.provider_ids}")
         provider_id = generic_transporter.provider_ids[name]
-        STDERR.puts("provider_id: #{provider_id}")
         UI.verbose("Inferred provider id #{provider_id} for team #{name}.")
         return FastlaneCore::ItunesTransporter.new(options[:username], nil, false, provider_id)
       rescue => ex

data/pilot/lib/pilot/manager.rb

@@ -24,7 +24,7 @@ module Pilot
         config[:username] ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
         UI.message("Login to App Store Connect (#{config[:username]})")
-        Spaceship::ConnectAPI.login(config[:username], team_id: config[:team_id], team_name: config[:team_name])
+        Spaceship::ConnectAPI.login(config[:username], use_portal: false, use_tunes: true, tunes_team_id: config[:team_id], team_name: config[:team_name])
         UI.message("Login successful")
       end
     end

data/precheck/lib/precheck/options.rb

@@ -60,6 +60,15 @@ module Precheck
                                      verify_block: proc do |value|
                                        ENV["FASTLANE_ITC_TEAM_NAME"] = value.to_s
                                      end),
+        FastlaneCore::ConfigItem.new(key: :platform,
+                                     short_option: "-j",
+                                     env_name: "PRECHECK_PLATFORM",
+                                     description: "The platform to use (optional)",
+                                     optional: true,
+                                     default_value: "ios",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include?(value)
+                                     end),
         FastlaneCore::ConfigItem.new(key: :default_rule_level,
                                      short_option: "-r",
                                      env_name: "PRECHECK_DEFAULT_RULE_LEVEL",

data/precheck/lib/precheck/rule_processor.rb

@@ -1,4 +1,5 @@
 require 'spaceship/tunes/language_item'
+require 'spaceship/tunes/iap_list'
 require 'fastlane/markdown_table_formatter'
 
 require_relative 'module'
@@ -43,8 +44,8 @@ module Precheck
   class RuleProcessor
     def self.process_app_and_version(app: nil, app_version: nil, rules: nil)
       items_to_check = []
-      items_to_check += generate_text_items_to_check(app: app, app_version: app_version)
-      items_to_check += generate_url_items_to_check(app: app, app_version: app_version)
+      items_to_check += generate_app_items_to_check(app: app)
+      items_to_check += generate_version_items_to_check(app_version: app_version)
 
       return process_rules(items_to_check: items_to_check, rules: rules)
     end
@@ -125,66 +126,41 @@ module Precheck
       return rule_hash
     end
 
-    def self.generate_url_items_to_check(app: nil, app_version: nil)
+    def self.generate_app_items_to_check(app: nil)
       items = []
-      items += collect_urls_from_hash(hash: app_version.support_url,
-                                 item_name: :support_url,
-                     friendly_name_postfix: "support URL")
-      items += collect_urls_from_hash(hash: app_version.marketing_url,
-                                 item_name: :marketing_url,
-                     friendly_name_postfix: "marketing URL",
-                               is_optional: true)
-
-      items += collect_urls_from_hash(hash: app.details.privacy_url,
-                                 item_name: :privacy_url,
-                     friendly_name_postfix: "privacy URL",
-                               is_optional: true)
-      return items
-    end
 
-    def self.collect_urls_from_hash(hash: nil, item_name: nil, friendly_name_postfix: nil, is_optional: false)
-      items = []
-      hash.each do |key, value|
-        items << URLItemToCheck.new(value, item_name, "#{friendly_name_postfix}: (#{key})", is_optional)
+      # App info localizations
+      app_info = app.fetch_edit_app_info
+      app_info_localizations = app_info.get_app_info_localizations
+      app_info_localizations.each do |localization|
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.name,
+                                                    item_name: :app_name,
+                                        friendly_name_postfix: "app name")
+
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.subtitle,
+                                                    item_name: :app_subtitle,
+                                        friendly_name_postfix: "app name subtitle",
+                                                  is_optional: true)
+
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.privacy_policy_text,
+                                                    item_name: :privacy_policy_text,
+                                        friendly_name_postfix: " tv privacy policy")
+
+        items << collect_urls_from_language_item(locale: localization.locale,
+                                                        value: localization.privacy_policy_url,
+                                                    item_name: :privacy_policy_url,
+                                        friendly_name_postfix: "privacy URL",
+                                                  is_optional: true)
       end
-      return items
-    end
-
-    def self.generate_text_items_to_check(app: nil, app_version: nil)
-      items = []
-
-      items << TextItemToCheck.new(app_version.copyright, :copyright, "copyright")
-
-      items += collect_text_items_from_language_item(hash: app_version.keywords,
-                                                item_name: :keywords,
-                                    friendly_name_postfix: "keywords")
-
-      items += collect_text_items_from_language_item(hash: app_version.description,
-                                                item_name: :description,
-                                    friendly_name_postfix: "description")
-
-      items += collect_text_items_from_language_item(hash: app_version.release_notes,
-                                                item_name: :release_notes,
-                                    friendly_name_postfix: "release notes")
-
-      items += collect_text_items_from_language_item(hash: app.details.name,
-                                                item_name: :app_name,
-                                    friendly_name_postfix: "app name")
-
-      items += collect_text_items_from_language_item(hash: app.details.apple_tv_privacy_policy,
-                                                item_name: :app_subtitle,
-                                    friendly_name_postfix: " tv privacy policy")
-
-      items += collect_text_items_from_language_item(hash: app.details.subtitle,
-                                                item_name: :app_subtitle,
-                                    friendly_name_postfix: "app name subtitle",
-                                              is_optional: true)
 
       should_include_iap = Precheck.config[:include_in_app_purchases]
       if should_include_iap
         UI.message("Reading in-app purchases. If you have a lot, this might take a while")
         UI.message("You can disable IAP checking by setting the `include_in_app_purchases` flag to `false`")
-        in_app_purchases = app.in_app_purchases.all
+        in_app_purchases = get_iaps(app_id: app.id)
         in_app_purchases ||= []
         in_app_purchases.each do |purchase|
           items += collect_iap_language_items(purchase_edit_versions: purchase.edit.versions)
@@ -195,6 +171,64 @@ module Precheck
       return items
     end
 
+    def self.generate_version_items_to_check(app_version: nil)
+      items = []
+
+      items << TextItemToCheck.new(app_version.copyright, :copyright, "copyright")
+
+      # Version localizations
+      version_localizations = app_version.get_app_store_version_localizations
+      version_localizations.each do |localization|
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.keywords,
+                                                    item_name: :keywords,
+                                        friendly_name_postfix: "keywords")
+
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.description,
+                                                    item_name: :description,
+                                        friendly_name_postfix: "description")
+
+        items << collect_text_items_from_language_item(locale: localization.locale,
+                                                        value: localization.whats_new,
+                                                    item_name: :release_notes,
+                                        friendly_name_postfix: "what's new")
+
+        items << collect_urls_from_language_item(locale: localization.locale,
+                                                        value: localization.support_url,
+                                                    item_name: :support_url,
+                                        friendly_name_postfix: "support URL")
+
+        items << collect_urls_from_language_item(locale: localization.locale,
+                                                        value: localization.marketing_url,
+                                                    item_name: :marketing_url,
+                                        friendly_name_postfix: "marketing URL",
+                                                 is_optional: true)
+      end
+
+      return items
+    end
+
+    # As of 2020-09-04, this is the only non App Store Connect call in prechecks
+    # This will need to get replaced when the API becomes available
+    def self.get_iaps(app_id: nil, include_deleted: false)
+      r = Spaceship::Tunes.client.iaps(app_id: app_id)
+      return_iaps = []
+      r.each do |product|
+        attrs = product
+
+        # This is not great but Spaceship::Tunes::IAPList.factory looks
+        # for `application.apple_id`
+        mock_application = OpenStruct.new({ apple_id: app_id })
+        attrs[:application] = mock_application
+
+        loaded_iap = Spaceship::Tunes::IAPList.factory(attrs)
+        next if loaded_iap.status == "deleted" && !include_deleted
+        return_iaps << loaded_iap
+      end
+      return return_iaps
+    end
+
     def self.collect_iap_language_items(purchase_edit_versions: nil, is_optional: false)
       items = []
       purchase_edit_versions.each do |language_key, hash|
@@ -207,12 +241,12 @@ module Precheck
     end
 
     # a few attributes are LanguageItem this method creates a TextItemToCheck for each pair
-    def self.collect_text_items_from_language_item(hash: nil, item_name: nil, friendly_name_postfix: nil, is_optional: false)
-      items = []
-      hash.each do |key, value|
-        items << TextItemToCheck.new(value, item_name, "#{friendly_name_postfix}: (#{key})", is_optional)
-      end
-      return items
+    def self.collect_text_items_from_language_item(locale: nil, value: nil, item_name: nil, friendly_name_postfix: nil, is_optional: false)
+      return TextItemToCheck.new(value, item_name, "#{friendly_name_postfix}: (#{locale})", is_optional)
+    end
+
+    def self.collect_urls_from_language_item(locale: nil, value: nil, item_name: nil, friendly_name_postfix: nil, is_optional: false)
+      return URLItemToCheck.new(value, item_name, "#{friendly_name_postfix}: (#{locale})", is_optional)
     end
   end
 end