fastlane 2.157.2 → 2.160.0

data/precheck/lib/precheck/runner.rb

@@ -18,10 +18,24 @@ module Precheck
                                          hide_keys: [:output_path],
                                              title: "Summary for precheck #{Fastlane::VERSION}")
 
-      unless Spaceship::Tunes.client
+      if api_token
+
+        # As of 2020-09-15, App Store Connect API does not have support for IAPs yet
+        # This means that API Key will fail if checking for IAPs.
+        #
+        # There is also a check in Deliver::Runner for this.
+        # Please remove check in Deliver when the API support IAPs.
+        if Precheck.config[:include_in_app_purchases]
+          UI.user_error!("Precheck cannot check In-app purchases with the App Store Connect API Key (yet). Exclude In-app purchases from precheck or use Apple ID login")
+        end
+
+        UI.message("Creating authorization token for App Store Connect API")
+        Spaceship::ConnectAPI.token = api_token
+      elsif Spaceship::Tunes.client.nil?
+        # 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("Starting login with user '#{Precheck.config[:username]}'")
-        Spaceship::Tunes.login(Precheck.config[:username])
-        Spaceship::Tunes.select_team
+        Spaceship::ConnectAPI.login(Precheck.config[:username], use_portal: false, use_tunes: true)
 
         UI.message("Successfully logged in")
       end
@@ -57,6 +71,12 @@ module Precheck
       return true
     end
 
+    def api_token
+      @api_token ||= Spaceship::ConnectAPI::Token.create(Precheck.config[:api_key]) if Precheck.config[:api_key]
+      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(Precheck.config[:api_key_path]) if Precheck.config[:api_key_path]
+      return @api_token
+    end
+
     def print_items_not_checked(processor_result: nil)
       names = processor_result.items_not_checked.map(&:friendly_name)
       UI.message("😶  Metadata fields not checked by any rule: #{names.join(', ')}".yellow) if names.length > 0
@@ -160,11 +180,12 @@ module Precheck
     end
 
     def app
-      Spaceship::Tunes::Application.find(Precheck.config[:app_identifier])
+      Spaceship::ConnectAPI::App.find(Precheck.config[:app_identifier])
     end
 
     def latest_app_version
-      @latest_version ||= app.latest_version
+      platform = Spaceship::ConnectAPI::Platform.map(Precheck.config[:platform])
+      @latest_version ||= app.get_edit_app_store_version(platform: platform)
     end
 
     # Makes sure the current App ID exists. If not, it will show an appropriate error message

data/produce/lib/produce/itunes_connect.rb

@@ -9,8 +9,9 @@ module Produce
       @full_bundle_identifier = app_identifier
       @full_bundle_identifier.gsub!('*', Produce.config[:bundle_identifier_suffix].to_s) if wildcard_bundle?
 
+      # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+      # Prompts select team if multiple teams and none specified
       Spaceship::ConnectAPI.login(Produce.config[:username], nil, use_portal: false, use_tunes: true)
-      Spaceship::ConnectAPI.client.select_team
 
       create_new_app
     end

data/sigh/lib/assets/resign.sh

@@ -72,6 +72,9 @@
 # new features June 2020
 # 1. enable (re)signing of OnDemandResources when ipa has been built for the appstore
 #
+# new features August 2020
+# 1. fixes usage for users with GNU-sed in their $PATH
+#
 
 # Logging functions
 
@@ -762,7 +765,7 @@ function resign {
 
             # Get the entry from app's entitlements
             # Read it with PlistBuddy as XML, then strip the header and <plist></plist> part
-            ENTITLEMENTS_VALUE="$(PlistBuddy -x -c "Print $KEY" "$APP_ENTITLEMENTS" 2>/dev/null | sed -e 's,.*<plist[^>]*>\(.*\)</plist>,\1,g')"
+            ENTITLEMENTS_VALUE="$(PlistBuddy -x -c "Print $KEY" "$APP_ENTITLEMENTS" 2>/dev/null | /usr/bin/sed -e 's,.*<plist[^>]*>\(.*\)</plist>,\1,g')"
             if [[ -z "$ENTITLEMENTS_VALUE" ]]; then
                 log "No value for '$KEY'"
                 continue
@@ -780,7 +783,7 @@ function resign {
                     log "Certificate $CERTIFICATE matches a SHA1 pattern"
                     local certificate_matches="$( security find-identity -v -p codesigning | grep -m 1 "$CERTIFICATE" )"
                     if [ -n "$certificate_matches" ]; then
-                        certificate_name="$( sed -E s/[^\"]+\"\([^\"]+\)\".*/\\1/ <<< $certificate_matches )"
+                        certificate_name="$(/usr/bin/sed -E s/[^\"]+\"\([^\"]+\)\".*/\\1/ <<< $certificate_matches )"
                         log "Certificate name: $certificate_name"
                     fi
                 fi
@@ -807,18 +810,18 @@ function resign {
             # otherwise it interprets they key path as nested keys
             # TODO: Should be able to replace with echo ${KEY//\./\\\\.} and remove shellcheck disable directive
             # shellcheck disable=SC2001
-            PLUTIL_KEY=$(echo "$KEY" | sed 's/\./\\\./g')
+            PLUTIL_KEY=$(echo "$KEY" | /usr/bin/sed 's/\./\\\./g')
             plutil -insert "$PLUTIL_KEY" -xml "$ENTITLEMENTS_VALUE" "$PATCHED_ENTITLEMENTS"
 
             # Patch the ID value if specified
             if [[ "$ID_TYPE" == "APP_ID" ]]; then
                 # Replace old value with new value in patched entitlements
                 log "Replacing old app identifier prefix '$OLD_APP_ID' with new value '$NEW_APP_ID'"
-                sed -i .bak "s/$OLD_APP_ID/$NEW_APP_ID/g" "$PATCHED_ENTITLEMENTS"
+                /usr/bin/sed -i .bak "s/$OLD_APP_ID/$NEW_APP_ID/g" "$PATCHED_ENTITLEMENTS"
             elif [[ "$ID_TYPE" == "TEAM_ID" ]]; then
                 # Replace old team identifier with new value
                 log "Replacing old team ID '$OLD_TEAM_ID' with new team ID: '$NEW_TEAM_ID'"
-                sed -i .bak "s/$OLD_TEAM_ID/$NEW_TEAM_ID/g" "$PATCHED_ENTITLEMENTS"
+                /usr/bin/sed -i .bak "s/$OLD_TEAM_ID/$NEW_TEAM_ID/g" "$PATCHED_ENTITLEMENTS"
             else
                 continue
             fi
@@ -835,7 +838,7 @@ function resign {
         # e.g. <string>AB1GP98Q19.com.example.foo</string>
         #         vs
         #      com.example.foo
-        sed -i .bak "s!${OLD_BUNDLE_ID}</string>!${NEW_BUNDLE_ID}</string>!g" "$PATCHED_ENTITLEMENTS"
+        /usr/bin/sed -i .bak "s!${OLD_BUNDLE_ID}</string>!${NEW_BUNDLE_ID}</string>!g" "$PATCHED_ENTITLEMENTS"
 
         log "Resigning application using certificate: '$CERTIFICATE'"
         log "and patched entitlements:"

data/sigh/lib/sigh/runner.rb

@@ -17,9 +17,10 @@ module Sigh
                                          hide_keys: [:output_path],
                                              title: "Summary for sigh #{Fastlane::VERSION}")
 
+      # 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("Starting login with user '#{Sigh.config[:username]}'")
       Spaceship::ConnectAPI.login(Sigh.config[:username], nil, use_portal: true, use_tunes: false)
-      Spaceship::ConnectAPI.select_team
       UI.message("Successfully logged in")
 
       profiles = [] if Sigh.config[:skip_fetch_profiles]

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -165,6 +165,8 @@ open class Snapshot: NSObject {
             }
 
             let screenshot = XCUIScreen.main.screenshot()
+            let image = XCUIDevice.shared.orientation.isLandscape ?  fixLandscapeOrientation(image: screenshot.image) : screenshot.image
+
             guard var simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
 
             do {
@@ -174,7 +176,7 @@ open class Snapshot: NSObject {
                 simulator = regex.stringByReplacingMatches(in: simulator, range: range, withTemplate: "")
 
                 let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
-                try screenshot.pngRepresentation.write(to: path)
+                try image.pngData()?.write(to: path, options: .atomic)
             } catch let error {
                 NSLog("Problem writing screenshot: \(name) to \(screenshotsDir)/\(simulator)-\(name).png")
                 NSLog(error.localizedDescription)
@@ -182,6 +184,19 @@ open class Snapshot: NSObject {
         #endif
     }
 
+    class func fixLandscapeOrientation(image: UIImage) -> UIImage {
+        if #available(iOS 10.0, *) {
+            let format = UIGraphicsImageRendererFormat()
+            format.scale = image.scale
+            let renderer = UIGraphicsImageRenderer(size: image.size, format: format)
+            return renderer.image { context in
+                image.draw(in: CGRect(x: 0, y: 0, width: image.size.width, height: image.size.height))
+            }
+        } else {
+            return image
+        }
+    }
+
     class func waitForLoadingIndicatorToDisappear(within timeout: TimeInterval) {
         #if os(tvOS)
             return
@@ -279,4 +294,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.23]
+// SnapshotHelperVersion [1.24]

data/spaceship/lib/spaceship/client.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'tmpdir'
 require 'cgi'
 require 'tempfile'
+require 'openssl'
 
 require 'fastlane/version'
 require_relative 'helper/net_http_generic_request'

data/spaceship/lib/spaceship/connect_api.rb

@@ -39,6 +39,7 @@ require 'spaceship/connect_api/models/app_info_localization'
 require 'spaceship/connect_api/models/app_preview_set'
 require 'spaceship/connect_api/models/app_preview'
 require 'spaceship/connect_api/models/app_price'
+require 'spaceship/connect_api/models/app_price_point'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'

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

@@ -43,20 +43,27 @@ module Spaceship
       # @param portal_team_id (String) (optional): The Spaceship::Portal team id
       # @param tunes_team_id (String) (optional): The Spaceship::Tunes team id
       # @param team_name (String) (optional): The team name
+      # @param skip_select_team (Boolean) (optional): Whether to skip automatic selection or prompt for team
       #
       # @raise InvalidUserCredentialsError: raised if authentication failed
       #
       # @return (Spaceship::ConnectAPI::Client) The client the login method was called for
-      def self.login(user = nil, password = nil, use_portal: true, use_tunes: true, portal_team_id: nil, tunes_team_id: nil, team_name: nil)
+      def self.login(user = nil, password = nil, use_portal: true, use_tunes: true, portal_team_id: nil, tunes_team_id: nil, team_name: nil, skip_select_team: false)
         portal_client = Spaceship::Portal.login(user, password) if use_portal
         tunes_client = Spaceship::Tunes.login(user, password) if use_tunes
 
-        # The clients will automatically select the first team if none is given
-        if portal_client && (!portal_team_id.nil? || !team_name.nil?)
-          portal_client.select_team(team_id: portal_team_id, team_name: team_name)
-        end
-        if tunes_client && (!tunes_team_id.nil? || !team_name.nil?)
-          tunes_client.select_team(team_id: tunes_team_id, team_name: team_name)
+        unless skip_select_team
+          # Check if environment variables are set for Spaceship::Portal or Spaceship::Tunes to select team
+          portal_team_id ||= ENV['FASTLANE_TEAM_ID']
+          portal_team_name = team_name || ENV['FASTLANE_TEAM_NAME']
+          tunes_team_id ||= ENV['FASTLANE_ITC_TEAM_ID']
+          tunes_team_name = team_name || ENV['FASTLANE_ITC_TEAM_NAME']
+
+          # The clients will prompt for a team selection if:
+          # 1. client exists
+          # 2. team_id and team_name are nil and user belongs to multiple teams
+          portal_client.select_team(team_id: portal_team_id, team_name: portal_team_name) if portal_client
+          tunes_client.select_team(team_id: tunes_team_id, team_name: tunes_team_name) if tunes_client
         end
 
         return ConnectAPI::Client.new(tunes_client: tunes_client, portal_client: portal_client)
@@ -89,6 +96,26 @@ module Spaceship
         )
       end
 
+      def portal_team_id
+        return nil if @portal_client.nil?
+        return @portal_client.team_id
+      end
+
+      def tunes_team_id
+        return nil if @tunes_client.nil?
+        return @tunes_client.team_id
+      end
+
+      def portal_teams
+        return nil if @portal_client.nil?
+        return @portal_client.teams
+      end
+
+      def tunes_teams
+        return nil if @tunes_client.nil?
+        return @tunes_client.teams
+      end
+
       def in_house?
         if token
           if token.in_house.nil?

data/spaceship/lib/spaceship/connect_api/file_uploader.rb

@@ -4,6 +4,8 @@ require 'faraday_middleware'
 
 require 'spaceship/globals'
 
+require 'openssl'
+
 module Spaceship
   class ConnectAPI
     module FileUploader

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

@@ -16,6 +16,7 @@ module Spaceship
       attr_accessor :available_in_new_territories
       attr_accessor :content_rights_declaration
       attr_accessor :app_store_versions
+      attr_accessor :prices
 
       module ContentRightsDeclaration
         USES_THIRD_PARTY_CONTENT = "USES_THIRD_PARTY_CONTENT"
@@ -34,9 +35,15 @@ module Spaceship
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
-        "appStoreVersions" => "app_store_versions"
+        "appStoreVersions" => "app_store_versions",
+        "prices" => "prices"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "appStoreVersions",
+        "prices"
+      ].join(",")
+
       def self.type
         return "apps"
       end
@@ -45,7 +52,7 @@ module Spaceship
       # Apps
       #
 
-      def self.all(filter: {}, includes: "appStoreVersions", limit: nil, sort: nil)
+      def self.all(filter: {}, includes: ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_apps(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
@@ -84,13 +91,13 @@ module Spaceship
       def fetch_live_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::READY_FOR_SALE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_APPLE_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
         ]
 
-        filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -106,8 +113,7 @@ module Spaceship
           Spaceship::ConnectAPI::AppInfo::AppStoreState::INVALID_BINARY
         ]
 
-        filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -128,8 +134,6 @@ module Spaceship
       #
 
       def fetch_app_prices(filter: {}, includes: "priceTier", limit: nil, sort: nil)
-        filter ||= {}
-        filter[:app] = id
         resp = Spaceship::ConnectAPI.get_app_prices(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
@@ -142,6 +146,7 @@ module Spaceship
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_APPLE_RELEASE,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW
@@ -192,7 +197,7 @@ module Spaceship
                .last
       end
 
-      def get_live_app_store_version(platform: nil, includes: nil)
+      def get_live_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
@@ -201,7 +206,7 @@ module Spaceship
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_edit_app_store_version(platform: nil, includes: nil)
+      def get_edit_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: [
@@ -221,7 +226,7 @@ module Spaceship
                .last
       end
 
-      def get_in_review_app_store_version(platform: nil, includes: nil)
+      def get_in_review_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
@@ -230,16 +235,19 @@ module Spaceship
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_pending_release_app_store_version(platform: nil, includes: nil)
+      def get_pending_release_app_store_version(platform: nil, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
-          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_APPLE_RELEASE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE
+          ].join(','),
           platform: platform
         }
         return get_app_store_versions(filter: filter, includes: includes).first
       end
 
-      def get_app_store_versions(filter: {}, includes: nil, limit: nil, sort: nil)
+      def get_app_store_versions(filter: {}, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end

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

@@ -20,6 +20,7 @@ module Spaceship
         READY_FOR_SALE = "READY_FOR_SALE"
         PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
         PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        PENDING_APPLE_RELEASE = "PENDING_APPLE_RELEASE"
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"

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

@@ -0,0 +1,26 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppPricePoint
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :customer_price
+
+      attr_accessor :proceeds
+
+      attr_accessor :price_tier
+      attr_accessor :territory
+
+      attr_mapping({
+        "customerPrice" => "customer_price",
+        "proceeds" => "proceeds",
+        "priceTier" => "price_tier",
+        "territory" => "territory"
+      })
+
+      def self.type
+        return "appPricePoints"
+      end
+    end
+  end
+end

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

@@ -112,8 +112,8 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        resp = Spaceship::ConnectAPI.get_app_screenshot_sets(filter: filter, includes: includes, limit: limit, sort: sort)
+      def self.all(app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        resp = Spaceship::ConnectAPI.get_app_screenshot_sets(app_store_version_localization_id: app_store_version_localization_id, filter: filter, includes: includes, limit: limit, sort: sort)
         return resp.to_models
       end
 

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

@@ -26,6 +26,7 @@ module Spaceship
         READY_FOR_SALE = "READY_FOR_SALE"
         PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
         PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        PENDING_APPLE_RELEASE = "PENDING_APPLE_RELEASE"
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
@@ -55,9 +56,15 @@ module Spaceship
         "downloadable" =>  "downloadable",
         "createdDate" =>  "created_date",
 
-        "appStoreVersionSubmission" => "app_store_version_submission"
+        "appStoreVersionSubmission" => "app_store_version_submission",
+        "build" => "build"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "appStoreVersionSubmission",
+        "build"
+      ].join(",")
+
       def self.type
         return "appStoreVersions"
       end
@@ -108,11 +115,8 @@ module Spaceship
         return resp.to_models.first
       end
 
-      # appScreenshotSets,appPreviewSets
-      def get_app_store_version_localizations(filter: {}, includes: "appScreenshotSets", limit: nil, sort: nil)
-        filter ||= {}
-        filter["appStoreVersion"] = id
-        return Spaceship::ConnectAPI::AppStoreVersionLocalization.all(filter: filter, includes: includes, limit: limit, sort: sort)
+      def get_app_store_version_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        return Spaceship::ConnectAPI::AppStoreVersionLocalization.all(app_store_version_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
       end
 
       #