fastlane 2.150.1 → 2.151.2

data/fastlane/swift/formatting/Rakefile

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+task(default: %w[setup])
+
+task(setup: [:brew, :lint])
+
+task(:brew) do
+  raise '`brew` is required. Please install brew. https://brew.sh/' unless system('which brew')
+
+  puts('➡️  Brew')
+  sh('brew bundle')
+end
+
+task(:lint) do
+  Dir.chdir('..') do
+    sh("swiftformat . --config formatting/.swiftformat --verbose --selfrequired waitWithPolling --exclude Fastfile.swift --swiftversion 4.0")
+  end
+end

data/fastlane/swift/main.swift

@@ -20,18 +20,18 @@ let timeout = argumentProcessor.commandTimeout
 class MainProcess {
     var doneRunningLane = false
     var thread: Thread!
-    
+
     @objc func connectToFastlaneAndRunLane() {
         runner.startSocketThread(port: argumentProcessor.port)
-        
+
         let completedRun = Fastfile.runLane(named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
         if completedRun {
             runner.disconnectFromFastlaneProcess()
         }
-        
+
         doneRunningLane = true
     }
-    
+
     func startFastlaneThread() {
         thread = Thread(target: self, selector: #selector(connectToFastlaneAndRunLane), object: nil)
         thread.name = "worker thread"
@@ -42,11 +42,10 @@ class MainProcess {
 let process: MainProcess = MainProcess()
 process.startFastlaneThread()
 
-while (!process.doneRunningLane && (RunLoop.current.run(mode: RunLoopMode.defaultRunLoopMode, before: Date(timeIntervalSinceNow: 2)))) {
+while !process.doneRunningLane, RunLoop.current.run(mode: RunLoopMode.defaultRunLoopMode, before: Date(timeIntervalSinceNow: 2)) {
     // no op
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
 // FastlaneRunnerAPIVersion [0.9.2]
-

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -149,14 +149,22 @@ module FastlaneCore
     end
 
     def additional_upload_parameters
-      # Workaround because the traditional transporter broke on 1st March 2018
-      # More information https://github.com/fastlane/fastlane/issues/11958
-      # As there was no communication from Apple, we don't know if this is a temporary
-      # server outage, or something they changed without giving a heads-up
-      if ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"].to_s.length == 0
-        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = "-t DAV,Signiant"
+      # As Apple recommends in Transporter User Guide we shouldn't specify the -t transport parameter
+      # and instead allow Transporter to use automatic transport discovery
+      # to determine the best transport mode for packages.
+      # It became crucial after WWDC 2020 as it leaded to "Broken pipe (Write failed)" exception
+      # More information https://github.com/fastlane/fastlane/issues/16749
+      env_deliver_additional_params = ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"]
+      if env_deliver_additional_params.to_s.strip.empty?
+        return nil
+      end
+
+      deliver_additional_params = env_deliver_additional_params.to_s.strip
+      if !deliver_additional_params.include?("-t ")
+        UI.user_error!("Invalid transport parameter")
+      else
+        return deliver_additional_params
       end
-      return ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"]
     end
   end
 
@@ -241,10 +249,11 @@ module FastlaneCore
     def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m upload',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           "-f #{source.shellescape}",
           additional_upload_parameters, # that's here, because the user might overwrite the -t option
           '-k 100000',
@@ -277,10 +286,11 @@ module FastlaneCore
     def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m lookupMetadata',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           "-apple_id #{apple_id.shellescape}",
           "-destination #{destination.shellescape}",
           ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
@@ -311,10 +321,11 @@ module FastlaneCore
     def build_provider_ids_command(username, password)
       if Helper.mac? && Helper.xcode_at_least?(11)
         [
+          "ITMS_TRANSPORTER_PASSWORD=#{password.shellescape}",
           'xcrun iTMSTransporter',
           '-m provider',
           "-u #{username.shellescape}",
-          "-p #{password.shellescape}",
+          "-p @env:ITMS_TRANSPORTER_PASSWORD",
           '2>&1' # cause stderr to be written to stdout
         ].compact.join(' ')
       else

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -205,7 +205,7 @@ module Commander
       ui.error(" - Use Homebrew")
       ui.error("    - update brew with `brew update`")
       ui.error("    - install fastlane using:")
-      ui.error("      - `brew cask install fastlane`")
+      ui.error("      - `brew install fastlane`")
       ui.error(" - Use One-Click-Installer:")
       ui.error("    - download fastlane at https://download.fastlane.tools")
       ui.error("    - extract the archive and double click the `install`")

data/match/lib/assets/READMETemplate.md

@@ -20,7 +20,7 @@ Install _fastlane_ using
 [sudo] gem install fastlane -NV
 ```
 
-or alternatively using `brew cask install fastlane`
+or alternatively using `brew install fastlane`
 
 ### Usage
 
@@ -29,12 +29,15 @@ Navigate to your project folder and run
 ```
 fastlane match appstore
 ```
+
 ```
 fastlane match adhoc
 ```
+
 ```
 fastlane match development
 ```
+
 ```
 fastlane match enterprise
 ```
@@ -51,6 +54,6 @@ This directory contains all your certificates with their private keys
 
 This directory contains all provisioning profiles
 
-------------------------------------
+---
 
 For more information open [fastlane match git repo](https://docs.fastlane.tools/actions/match/)

data/match/lib/match/options.rb

@@ -186,6 +186,10 @@ module Match
                                      env_name: "MATCH_S3_BUCKET",
                                      description: "Name of the S3 bucket",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :s3_object_prefix,
+                                     env_name: "MATCH_S3_OBJECT_PREFIX",
+                                     description: "Prefix to be used on all objects uploaded to S3",
+                                     optional: true),
 
         # Keychain
         FastlaneCore::ConfigItem.new(key: :keychain_name,

data/match/lib/match/runner.rb

@@ -46,10 +46,11 @@ module Match
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
         google_cloud_project_id: params[:google_cloud_project_id].to_s,
-        s3_region: params[:s3_region].to_s,
-        s3_access_key: params[:s3_access_key].to_s,
-        s3_secret_access_key: params[:s3_secret_access_key].to_s,
-        s3_bucket: params[:s3_bucket].to_s,
+        s3_region: params[:s3_region],
+        s3_access_key: params[:s3_access_key],
+        s3_secret_access_key: params[:s3_secret_access_key],
+        s3_bucket: params[:s3_bucket],
+        s3_object_prefix: params[:s3_object_prefix],
         readonly: params[:readonly],
         username: params[:readonly] ? nil : params[:username], # only pass username if not readonly
         team_id: params[:team_id],

data/match/lib/match/storage/git_storage.rb

@@ -113,7 +113,7 @@ module Match
           UI.user_error!("Error cloning repo, make sure you have access to it '#{self.git_url}'")
         end
 
-        checkout_branch unless self.branch == "master"
+        checkout_branch
       end
 
       def human_readable_description

data/match/lib/match/storage/s3_storage.rb

@@ -14,6 +14,7 @@ module Match
       attr_reader :s3_bucket
       attr_reader :s3_region
       attr_reader :s3_client
+      attr_reader :s3_object_prefix
       attr_reader :readonly
       attr_reader :username
       attr_reader :team_id
@@ -24,6 +25,7 @@ module Match
         s3_access_key = params[:s3_access_key]
         s3_secret_access_key = params[:s3_secret_access_key]
         s3_bucket = params[:s3_bucket]
+        s3_object_prefix = params[:s3_object_prefix]
 
         if params[:git_url].to_s.length > 0
           UI.important("Looks like you still define a `git_url` somewhere, even though")
@@ -37,6 +39,7 @@ module Match
           s3_access_key: s3_access_key,
           s3_secret_access_key: s3_secret_access_key,
           s3_bucket: s3_bucket,
+          s3_object_prefix: s3_object_prefix,
           readonly: params[:readonly],
           username: params[:username],
           team_id: params[:team_id],
@@ -48,6 +51,7 @@ module Match
                      s3_access_key: nil,
                      s3_secret_access_key: nil,
                      s3_bucket: nil,
+                     s3_object_prefix: nil,
                      readonly: nil,
                      username: nil,
                      team_id: nil,
@@ -55,6 +59,7 @@ module Match
         @s3_bucket = s3_bucket
         @s3_region = s3_region
         @s3_client = Fastlane::Helper::S3ClientHelper.new(access_key: s3_access_key, secret_access_key: s3_secret_access_key, region: s3_region)
+        @s3_object_prefix = s3_object_prefix.to_s
         @readonly = readonly
         @username = username
         @team_id = team_id
@@ -88,8 +93,10 @@ module Match
         # No existing working directory, creating a new one now
         self.working_directory = Dir.mktmpdir
 
-        s3_client.find_bucket!(s3_bucket).objects.each do |object|
-          file_path = object.key # :team_id/path/to/file
+        s3_client.find_bucket!(s3_bucket).objects(prefix: s3_object_prefix).each do |object|
+          file_path = strip_s3_object_prefix(object.key) # :s3_object_prefix:team_id/path/to/file
+
+          # strip s3_prefix from file_path
           download_path = File.join(self.working_directory, file_path)
 
           FileUtils.mkdir_p(File.expand_path("..", download_path))
@@ -113,12 +120,11 @@ module Match
 
         files_to_upload.each do |file_name|
           # Go from
-          #   "/var/folders/px/bz2kts9n69g8crgv4jpjh6b40000gn/T/d20181026-96528-1av4gge/profiles/development/Development_me.mobileprovision"
+          #   "/var/folders/px/bz2kts9n69g8crgv4jpjh6b40000gn/T/d20181026-96528-1av4gge/:team_id/profiles/development/Development_me.mobileprovision"
           # to
-          #   "profiles/development/Development_me.mobileprovision"
+          #   ":s3_object_prefix:team_id/profiles/development/Development_me.mobileprovision"
           #
-
-          target_path = sanitize_file_name(file_name)
+          target_path = s3_object_path(file_name)
           UI.verbose("Uploading '#{target_path}' to S3 Storage...")
 
           body = File.read(file_name)
@@ -130,7 +136,8 @@ module Match
 
       def delete_files(files_to_delete: [], custom_message: nil)
         files_to_delete.each do |file_name|
-          target_path = sanitize_file_name(file_name)
+          target_path = s3_object_path(file_name)
+          UI.verbose("Deleting '#{target_path}' from S3 Storage...")
           s3_client.delete_file(s3_bucket, target_path)
         end
       end
@@ -152,6 +159,17 @@ module Match
 
       private
 
+      def s3_object_path(file_name)
+        santized = sanitize_file_name(file_name)
+        return santized if santized.start_with?(s3_object_prefix)
+
+        s3_object_prefix + santized
+      end
+
+      def strip_s3_object_prefix(object_path)
+        object_path.gsub(/^#{s3_object_prefix}/, "")
+      end
+
       def sanitize_file_name(file_name)
         file_name.gsub(self.working_directory + "/", "")
       end

data/sigh/lib/assets/resign.sh

@@ -69,6 +69,9 @@
 # new features March 2019
 # 1. two more fixes for only creating the archived-expanded-entitlements.xcent file if the version of Xcode < 9.3 as Xcode 10 does not create it.
 #
+# new features June 2020
+# 1. enable (re)signing of OnDemandResources when ipa has been built for the appstore
+#
 
 # Logging functions
 
@@ -528,6 +531,21 @@ function resign {
         PlistBuddy -c "Set :CFBundleVersion $BUNDLE_VERSION" "$APP_PATH/Info.plist"
     fi
 
+    # Check for and resign OnDemandResource folders
+    ODR_DIR="$(dirname $APP_PATH)/OnDemandResources"
+    if [ -d "$ODR_DIR" ]; then
+        for assetpack in "$ODR_DIR"/*
+        do
+            if [[ "$assetpack" == *.assetpack ]]; then
+                rm -rf $assetpack/_CodeSignature
+                /usr/bin/codesign ${VERBOSE} ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" "$assetpack"
+                checkStatus
+            else
+                log "Ignoring non-assetpack: $assetpack"
+            fi
+        done
+    fi
+
     # Check for and resign any embedded frameworks (new feature for iOS 8 and above apps)
     FRAMEWORKS_DIR="$APP_PATH/Frameworks"
     if [ -d "$FRAMEWORKS_DIR" ]; then

data/spaceship/lib/spaceship/client.rb

@@ -1,3 +1,4 @@
+require 'babosa'
 require 'faraday' # HTTP Client
 require 'faraday-cookie_jar'
 require 'faraday_middleware'
@@ -7,7 +8,6 @@ require 'cgi'
 require 'tempfile'
 
 require 'fastlane/version'
-require_relative 'babosa_fix'
 require_relative 'helper/net_http_generic_request'
 require_relative 'helper/plist_middleware'
 require_relative 'helper/rels_middleware'
@@ -206,7 +206,6 @@ module Spaceship
 
       @client = Faraday.new(self.class.hostname, options) do |c|
         c.response(:json, content_type: /\bjson$/)
-        c.response(:xml, content_type: /\bxml$/)
         c.response(:plist, content_type: /\bplist$/)
         c.use(:cookie_jar, jar: @cookie)
         c.use(FaradayMiddleware::RelsMiddleware)

data/spaceship/lib/spaceship/connect_api.rb

@@ -50,6 +50,7 @@ require 'spaceship/connect_api/models/app_store_version_phased_release'
 require 'spaceship/connect_api/models/app_store_version'
 require 'spaceship/connect_api/models/idfa_declaration'
 require 'spaceship/connect_api/models/reset_ratings_request'
+require 'spaceship/connect_api/models/sandbox_tester'
 require 'spaceship/connect_api/models/territory'
 
 module Spaceship

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

@@ -28,7 +28,6 @@ module Spaceship
 
           @client = Faraday.new(hostname, options) do |c|
             c.response(:json, content_type: /\bjson$/)
-            c.response(:xml, content_type: /\bxml$/)
             c.response(:plist, content_type: /\bplist$/)
             c.use(FaradayMiddleware::RelsMiddleware)
             c.adapter(Faraday.default_adapter)

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

@@ -74,7 +74,6 @@ module Spaceship
 
         @client ||= Faraday.new(options) do |c|
           c.response(:json, content_type: /\bjson$/)
-          c.response(:xml, content_type: /\bxml$/)
           c.response(:plist, content_type: /\bplist$/)
           c.adapter(Faraday.default_adapter)
 

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

@@ -78,7 +78,7 @@ module Spaceship
       # App Info
       #
 
-      def fetch_edit_app_info
+      def fetch_edit_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::DEVELOPER_REJECTED,
@@ -89,7 +89,7 @@ module Spaceship
         ]
 
         filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter)
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -110,7 +110,7 @@ module Spaceship
       # App Store Versions
       #
 
-      def reject_version_if_possible!
+      def reject_version_if_possible!(platform: nil)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
           appStoreState: [

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

@@ -9,6 +9,13 @@ module Spaceship
       attr_accessor :brazil_age_rating
       attr_accessor :kids_age_band
 
+      attr_accessor :primary_category
+      attr_accessor :primary_subcategory_one
+      attr_accessor :primary_subcategory_two
+      attr_accessor :secondary_category
+      attr_accessor :secondary_subcategory_one
+      attr_accessor :secondary_subcategory_two
+
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
         PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
@@ -30,9 +37,25 @@ module Spaceship
         "appStoreState" => "app_store_state",
         "appStoreAgeRating" => "app_store_age_rating",
         "brazilAgeRating" => "brazil_age_rating",
-        "kidsAgeBand" => "kids_age_band"
+        "kidsAgeBand" => "kids_age_band",
+
+        "primaryCategory" => "primary_category",
+        "primarySubcategoryOne" => "primary_subcategory_one",
+        "primarySubcategoryTwo" => "primary_subcategory_two",
+        "secondaryCategory" => "secondary_category",
+        "secondarySubcategoryOne" => "secondary_subcategory_one",
+        "secondarySubcategoryTwo" => "secondary_subcategory_two"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "primaryCategory",
+        "primarySubcategoryOne",
+        "primarySubcategoryTwo",
+        "secondaryCategory",
+        "secondarySubcategoryOne",
+        "secondarySubcategoryTwo"
+      ].join(",")
+
       def self.type
         return "appInfos"
       end