fastlane 2.108.0 → 2.109.0

data/match/lib/match/runner.rb

@@ -166,7 +166,7 @@ module Match
 
       if params[:force_for_new_devices] && !params[:readonly]
         if prov_type != :appstore
-          params[:force] = device_count_different?(profile: profile, keychain_path: keychain_path) unless params[:force]
+          params[:force] = device_count_different?(profile: profile, keychain_path: keychain_path, platform: params[:platform].to_sym) unless params[:force]
         else
           # App Store provisioning profiles don't contain device identifiers and
           # thus shouldn't be renewed if the device count has changed.
@@ -229,7 +229,7 @@ module Match
       return uuid
     end
 
-    def device_count_different?(profile: nil, keychain_path: nil)
+    def device_count_different?(profile: nil, keychain_path: nil, platform: nil)
       return false unless profile
 
       parsed = FastlaneCore::ProvisioningProfile.parse(profile, keychain_path)
@@ -238,7 +238,19 @@ module Match
 
       if portal_profile
         profile_device_count = portal_profile.devices.count
-        portal_device_count = Spaceship.device.all.count
+
+        portal_device_count =
+          case platform
+          when :ios
+            Spaceship.device.all_ios_profile_devices.count
+          when :tvos
+            Spaceship.device.all_apple_tvs.count
+          when :mac
+            Spaceship.device.all_macs.count
+          else
+            Spaceship.device.all.count
+          end
+
         return portal_device_count != profile_device_count
       end
       return false

data/match/lib/match/spaceship_ensure.rb

@@ -59,11 +59,8 @@ module Match
       end
 
       unless found
-        UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal")
-        UI.error("for the user #{username}")
-        UI.error("Make sure to use the same user and team every time you run 'match' for this")
-        UI.error("Git repository. This might be caused by deleting the provisioning profile on the Dev Portal")
-        UI.user_error!("To reset the provisioning profiles of your Apple account, you can use the `fastlane match nuke` feature, more information on https://docs.fastlane.tools/actions/match/")
+        UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal for the user #{username}, fixing this now for you 🔨")
+        return false
       end
 
       if found.valid?

data/match/lib/match/storage.rb

@@ -3,13 +3,35 @@ require_relative 'storage/git_storage'
 
 module Match
   module Storage
-    def self.for_mode(storage_mode, params)
-      if storage_mode == "git"
-        return Storage::GitStorage.configure(params)
-      elsif storage_mode == "google_cloud"
-        # return Storage::GoogleCloudStorage
-      else
-        UI.user_error!("Invalid storage mode '#{storage_mode}'")
+    class << self
+      def backends
+        @backends ||= {
+          "git" => lambda { |params|
+            return Storage::GitStorage.configure(params)
+          }
+        }
+      end
+
+      def register_backend(type: nil, storage_class: nil, &configurator)
+        UI.user_error!("No type specified for storage backend") if type.nil?
+
+        normalized_name = type.to_s
+        UI.message("Replacing Match::Encryption backend for type '#{normalized_name}'") if backends.include?(normalized_name)
+
+        if configurator
+          @backends[normalized_name] = configurator
+        elsif storage_class
+          @backends[normalized_name] = ->(params) { return storage_class.configure(params) }
+        else
+          UI.user_error!("Specify either a `storage_class` or a configuration block when registering a storage backend")
+        end
+      end
+
+      def for_mode(storage_mode, params)
+        configurator = backends[storage_mode.to_s]
+        return configurator.call(params) if configurator
+
+        UI.user_error!("No storage backend for storage mode '#{storage_mode}'")
       end
     end
   end

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

@@ -7,8 +7,6 @@ module Match
   module Storage
     # Store the code signing identities in a git repo
     class GitStorage < Interface
-      MATCH_VERSION_FILE_NAME = "match_version.txt"
-
       # User provided values
       attr_accessor :git_url
       attr_accessor :shallow_clone
@@ -98,54 +96,18 @@ module Match
         checkout_branch unless self.branch == "master"
       end
 
-      def save_changes!(files_to_commit: [], custom_message: nil)
-        Dir.chdir(File.expand_path(self.working_directory)) do
-          commands = []
-
-          if files_to_commit.count > 0 # e.g. for nuke this is treated differently
-            if !File.exist?(MATCH_VERSION_FILE_NAME) || File.read(MATCH_VERSION_FILE_NAME) != Fastlane::VERSION.to_s
-              files_to_commit << MATCH_VERSION_FILE_NAME
-              File.write(MATCH_VERSION_FILE_NAME, Fastlane::VERSION) # stored unencrypted
-            end
-
-            template = File.read("#{Match::ROOT}/lib/assets/READMETemplate.md")
-            readme_path = "README.md"
-            if (!File.exist?(readme_path) || File.read(readme_path) != template) && !self.skip_docs
-              files_to_commit << readme_path
-              File.write(readme_path, template)
-            end
-
-            # `git add` each file we want to commit
-            #   - Fixes https://github.com/fastlane/fastlane/issues/8917
-            #   - Fixes https://github.com/fastlane/fastlane/issues/8793
-            #   - Replaces, closes and fixes https://github.com/fastlane/fastlane/pull/8919
-            commands += files_to_commit.map do |current_file|
-              "git add #{current_file.shellescape}"
-            end
-          else
-            # No specific list given, e.g. this happens on `fastlane match nuke`
-            # We just want to run `git add -A` to commit everything
-            commands << "git add -A"
-          end
-          commit_message = custom_message || generate_commit_message
-          commands << "git commit -m #{commit_message.shellescape}"
-          commands << "GIT_TERMINAL_PROMPT=0 git push origin #{self.branch.shellescape}"
-
-          UI.message("Pushing changes to remote git repo...")
-
-          begin
-            commands.each do |command|
-              FastlaneCore::CommandExecutor.execute(command: command,
-                                                  print_all: FastlaneCore::Globals.verbose?,
-                                              print_command: FastlaneCore::Globals.verbose?)
-            end
+      def delete_files(files_to_delete: [], custom_message: nil)
+        # No specific list given, e.g. this happens on `fastlane match nuke`
+        # We just want to run `git add -A` to commit everything
+        git_push(commands: ["git add -A"], commit_message: custom_message)
+      end
 
-            self.clear_changes
-          rescue => ex
-            UI.error("Couldn't commit or push changes back to git...")
-            UI.error(ex)
-          end
+      def upload_files(files_to_upload: [], custom_message: nil)
+        commands = files_to_upload.map do |current_file|
+          "git add #{current_file.shellescape}"
         end
+
+        git_push(commands: commands, commit_message: custom_message)
       end
 
       def clear_changes
@@ -223,6 +185,26 @@ module Match
           end
         end
       end
+
+      private # rubocop:disable Lint/UselessAccessModifier
+
+      def git_push(commands: [], commit_message: nil)
+        commit_message ||= generate_commit_message
+        commands << "git commit -m #{commit_message.shellescape}"
+        commands << "GIT_TERMINAL_PROMPT=0 git push origin #{self.branch.shellescape}"
+
+        UI.message("Pushing changes to remote git repo...")
+        commands.each do |command|
+          FastlaneCore::CommandExecutor.execute(command: command,
+                                                print_all: FastlaneCore::Globals.verbose?,
+                                                print_command: FastlaneCore::Globals.verbose?)
+        end
+
+        self.clear_changes
+      rescue => ex
+        UI.error("Couldn't commit or push changes back to git...")
+        UI.error(ex)
+      end
     end
   end
 end

data/match/lib/match/storage/interface.rb

@@ -1,6 +1,10 @@
+require_relative '../module'
+
 module Match
   module Storage
     class Interface
+      MATCH_VERSION_FILE_NAME = "match_version.txt"
+
       # The working directory in which we download all the profiles
       # and decrypt/encrypt them
       attr_accessor :working_directory
@@ -37,7 +41,41 @@ module Match
       #   that should be committed to the storage provider
       # @parameter custom_message: [String] Custom change message
       #           that's optional, is used for commit title
-      def save_changes!(files_to_commit: [], custom_message: nil)
+      def save_changes!(files_to_commit: [], files_to_delete: [], custom_message: nil)
+        Dir.chdir(File.expand_path(self.working_directory)) do
+          if files_to_commit.count > 0 # everything that isn't `match nuke`
+            UI.user_error!("You can't provide both `files_to_delete` and `files_to_commit` right now") if files_to_delete.count > 0
+
+            if !File.exist?(MATCH_VERSION_FILE_NAME) || File.read(MATCH_VERSION_FILE_NAME) != Fastlane::VERSION.to_s
+              files_to_commit << MATCH_VERSION_FILE_NAME
+              File.write(MATCH_VERSION_FILE_NAME, Fastlane::VERSION) # stored unencrypted
+            end
+
+            template = File.read("#{Match::ROOT}/lib/assets/READMETemplate.md")
+            readme_path = "README.md"
+            if (!File.exist?(readme_path) || File.read(readme_path) != template) && !self.skip_docs
+              files_to_commit << readme_path
+              File.write(readme_path, template)
+            end
+
+            self.upload_files(files_to_upload: files_to_commit, custom_message: custom_message)
+          elsif files_to_delete.count > 0
+            self.delete_files(files_to_delete: files_to_delete, custom_message: custom_message)
+          else
+            UI.user_error!("Neither `files_to_commit` nor `files_to_delete` were provided to the `save_changes!` method call")
+          end
+        end
+      end
+
+      def upload_files(files_to_upload: [], custom_message: nil)
+        not_implemented(__method__)
+      end
+
+      def delete_files(files_to_delete: [], custom_message: nil)
+        not_implemented(__method__)
+      end
+
+      def skip_docs
         not_implemented(__method__)
       end
 

data/precheck/lib/precheck/rules/other_platforms_rule.rb

@@ -19,7 +19,10 @@ module Precheck
     end
 
     def allowed_lowercased_words
-      ["google analytics"]
+      [
+        "google analytics",
+        "google drive"
+      ]
     end
 
     def lowercased_words_to_look_for

data/scan/lib/scan/error_handler.rb

@@ -24,11 +24,18 @@ module Scan
           print("https://stackoverflow.com/a/17031697/445598")
         when /Testing failed/
           UI.build_failure!("Error building the application - see the log above")
-        when /Executed/
+        when /Executed/, /Failing tests:/
           # this is *really* important:
           # we don't want to raise an exception here
           # as we handle this in runner.rb at a later point
           # after parsing the actual test results
+          # ------------------------------------------------
+          # For the "Failing tests:" case, this covers Xcode
+          # 10 parallel testing failure, which doesn't
+          # print out the "Executed" line that would show
+          # test summary (number of tests passed, etc.).
+          # Instead, it just prints "Failing tests:"
+          # followed by a list of tests that failed.
           return
         end
         UI.build_failure!("Error building/testing the application - see the log above")

data/sigh/lib/assets/resign.sh

@@ -60,6 +60,9 @@
 # 4. extracts the entitlements from the provisioning profile
 # 5. copy the entitlements as archived-expanded-entitlements.xcent inside the app bundle (because Xcode does too)
 #
+# new features November 2018
+# 1. only create the archived-expanded-entitlements.xcent file if the version of Xcode < 9.3 as Xcode 10 does not create it.
+#
 
 # Logging functions
 
@@ -81,8 +84,7 @@ warning() {
 function checkStatus {
 
     # shellcheck disable=SC2181
-    if [ $? -ne 0 ];
-    then
+    if [ $? -ne 0 ]; then
         error "Encountered an error, aborting!"
     fi
 }
@@ -154,6 +156,7 @@ PROVISIONS_BY_ID=()
 DEFAULT_PROVISION=""
 TEMP_DIR="_floatsignTemp"
 USE_APP_ENTITLEMENTS=""
+XCODE_VERSION="$(xcodebuild -version | grep "Xcode" | /usr/bin/cut -f 2 -d ' ')"
 
 # List of plist keys used for reference to and from nested apps and extensions
 NESTED_APP_REFERENCE_KEYS=(":WKCompanionAppBundleIdentifier" ":NSExtension:NSExtensionAttributes:WKAppBundleIdentifier")
@@ -220,8 +223,7 @@ while [ "$1" != "" ]; do
 done
 
 KEYCHAIN_FLAG=
-if [ -n "$KEYCHAIN_PATH" ]
-then
+if [ -n "$KEYCHAIN_PATH" ]; then
     KEYCHAIN_FLAG="--keychain $KEYCHAIN_PATH"
 fi
 
@@ -254,8 +256,7 @@ log "Certificate: '$CERTIFICATE'"
 [[ -n "${USE_APP_ENTITLEMENTS}" && -n ${ENTITLEMENTS} ]] && error "--use-app-entitlements option cannot be used in combination with -e, --entitlements option."
 
 # Check output file name
-if [ -z "$NEW_FILE" ];
-then
+if [ -z "$NEW_FILE" ]; then
     error "Output file name required"
 fi
 
@@ -264,8 +265,7 @@ if [[ "${#RAW_PROVISIONS[*]}" == "0" ]]; then
 fi
 
 # Check for and remove the temporary directory if it already exists
-if [ -d "$TEMP_DIR" ];
-then
+if [ -d "$TEMP_DIR" ]; then
     log "Removing previous temporary directory: '$TEMP_DIR'"
     rm -Rf "$TEMP_DIR"
 fi
@@ -275,13 +275,11 @@ extension="${filename##*.}"
 filename="${filename%.*}"
 
 # Check if the supplied file is an ipa or an app file
-if [ "${extension}" = "ipa" ]
-then
+if [ "${extension}" = "ipa" ]; then
     # Unzip the old ipa quietly
     unzip -q "$ORIGINAL_FILE" -d $TEMP_DIR
     checkStatus
-elif [ "${extension}" = "app" ]
-then
+elif [ "${extension}" = "app" ]; then
     # Copy the app file into an ipa-like structure
     mkdir -p "$TEMP_DIR/Payload"
     cp -Rf "${ORIGINAL_FILE}" "$TEMP_DIR/Payload/${filename}.app"
@@ -291,8 +289,7 @@ else
 fi
 
 # check the keychain
-if [ "${KEYCHAIN}" != "" ];
-then
+if [ "${KEYCHAIN}" != "" ]; then
     security list-keychains -s "$KEYCHAIN"
     security unlock "$KEYCHAIN"
     security default-keychain -s "$KEYCHAIN"
@@ -400,8 +397,7 @@ function resign {
     fi
 
     # Make sure that the Info.plist file is where we expect it
-    if [ ! -e "$APP_PATH/Info.plist" ];
-    then
+    if [ ! -e "$APP_PATH/Info.plist" ]; then
         error "Expected file does not exist: '$APP_PATH/Info.plist'"
     fi
 
@@ -447,10 +443,8 @@ function resign {
     log "New bundle identifier will be: '$BUNDLE_IDENTIFIER'"
 
     # Update the CFBundleDisplayName property in the Info.plist if a new name has been provided
-    if [ "${DISPLAY_NAME}" != "" ];
-    then
-        if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ];
-        then
+    if [ "${DISPLAY_NAME}" != "" ]; then
+        if [ "${DISPLAY_NAME}" != "${CURRENT_NAME}" ]; then
             log "Changing display name from '$CURRENT_NAME' to '$DISPLAY_NAME'"
             PlistBuddy -c "Set :CFBundleDisplayName $DISPLAY_NAME" "$APP_PATH/Info.plist"
         fi
@@ -465,8 +459,7 @@ function resign {
     if [ "$APP_IDENTIFIER_PREFIX" == "" ];
     then
         APP_IDENTIFIER_PREFIX=$(PlistBuddy -c "Print :ApplicationIdentifierPrefix:0" "$TEMP_DIR/profile.plist")
-        if [ "$APP_IDENTIFIER_PREFIX" == "" ];
-        then
+        if [ "$APP_IDENTIFIER_PREFIX" == "" ]; then
             error "Failed to extract any app identifier prefix from '$NEW_PROVISION'"
         else
             warning "WARNING: extracted an app identifier prefix '$APP_IDENTIFIER_PREFIX' from '$NEW_PROVISION', but it was not found in the profile's entitlements"
@@ -479,11 +472,9 @@ function resign {
     PlistBuddy -c "Set :AppIdentifierPrefix $APP_IDENTIFIER_PREFIX." "$APP_PATH/Info.plist" 2>/dev/null
 
     TEAM_IDENTIFIER=$(PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n')
-    if [ "$TEAM_IDENTIFIER" == "" ];
-    then
+    if [ "$TEAM_IDENTIFIER" == "" ]; then
         TEAM_IDENTIFIER=$(PlistBuddy -c "Print :TeamIdentifier:0" "$TEMP_DIR/profile.plist")
-        if [ "$TEAM_IDENTIFIER" == "" ];
-        then
+        if [ "$TEAM_IDENTIFIER" == "" ]; then
             warning "Failed to extract team identifier from '$NEW_PROVISION', resigned ipa may fail on iOS 8 and higher"
         else
             warning "WARNING: extracted a team identifier '$TEAM_IDENTIFIER' from '$NEW_PROVISION', but it was not found in the profile's entitlements, resigned ipa may fail on iOS 8 and higher"
@@ -499,19 +490,16 @@ function resign {
     cp -f "$NEW_PROVISION" "$APP_PATH/embedded.mobileprovision"
 
     #if the current bundle identifier is different from the new one in the provisioning profile, then change it.
-    if [ "$CURRENT_BUNDLE_IDENTIFIER" != "$BUNDLE_IDENTIFIER" ];
-    then
+    if [ "$CURRENT_BUNDLE_IDENTIFIER" != "$BUNDLE_IDENTIFIER" ]; then
         log "Updating the bundle identifier from '$CURRENT_BUNDLE_IDENTIFIER' to '$BUNDLE_IDENTIFIER'"
         PlistBuddy -c "Set :CFBundleIdentifier $BUNDLE_IDENTIFIER" "$APP_PATH/Info.plist"
         checkStatus
     fi
 
     # Update the version number properties in the Info.plist if a version number has been provided
-    if [ "$VERSION_NUMBER" != "" ];
-    then
+    if [ "$VERSION_NUMBER" != "" ]; then
         CURRENT_VERSION_NUMBER=$(PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist")
-        if [ "$VERSION_NUMBER" != "$CURRENT_VERSION_NUMBER" ];
-        then
+        if [ "$VERSION_NUMBER" != "$CURRENT_VERSION_NUMBER" ]; then
             log "Updating the version from '$CURRENT_VERSION_NUMBER' to '$VERSION_NUMBER'"
             PlistBuddy -c "Set :CFBundleVersion $VERSION_NUMBER" "$APP_PATH/Info.plist"
             PlistBuddy -c "Set :CFBundleShortVersionString $VERSION_NUMBER" "$APP_PATH/Info.plist"
@@ -519,8 +507,7 @@ function resign {
     fi
 
     # Update short version string in the Info.plist if provided
-    if [[ -n "$SHORT_VERSION" ]];
-    then
+    if [[ -n "$SHORT_VERSION" ]]; then
         CURRENT_VALUE="$(PlistBuddy -c "Print :CFBundleShortVersionString" "$APP_PATH/Info.plist")"
         # Even if the old value is same - just update, less code, less debugging
         log "Updating the short version string (CFBundleShortVersionString) from '$CURRENT_VALUE' to '$SHORT_VERSION'"
@@ -528,8 +515,7 @@ function resign {
     fi
 
     # Update bundle version in the Info.plist if provided
-    if [[ -n "$BUNDLE_VERSION" ]];
-    then
+    if [[ -n "$BUNDLE_VERSION" ]]; then
         CURRENT_VALUE="$(PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Info.plist")"
         # Even if the old value is same - just update, less code, less debugging
         log "Updating the bundle version (CFBundleVersion) from '$CURRENT_VALUE' to '$BUNDLE_VERSION'"
@@ -538,18 +524,15 @@ function resign {
 
     # 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
-        if [ "$TEAM_IDENTIFIER" == "" ];
-        then
+    if [ -d "$FRAMEWORKS_DIR" ]; then
+        if [ "$TEAM_IDENTIFIER" == "" ]; then
             error "ERROR: embedded frameworks detected, re-signing iOS 8 (or higher) applications wihout a team identifier in the certificate/profile does not work"
         fi
 
         log "Resigning embedded frameworks using certificate: '$CERTIFICATE'"
         for framework in "$FRAMEWORKS_DIR"/*
         do
-            if [[ "$framework" == *.framework || "$framework" == *.dylib ]]
-            then
+            if [[ "$framework" == *.framework || "$framework" == *.dylib ]]; then
                 log "Resigning '$framework'"
                 # Must not qote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
                 # shellcheck disable=SC2086
@@ -566,46 +549,37 @@ function resign {
     for key in "${NESTED_APP_REFERENCE_KEYS[@]}"; do
         # Check if Info.plist has a reference to another app or extension
         REF_BUNDLE_ID=$(PlistBuddy -c "Print ${key}" "$APP_PATH/Info.plist" 2>/dev/null)
-        if [ -n "$REF_BUNDLE_ID" ];
-        then
+        if [ -n "$REF_BUNDLE_ID" ]; then
             # Found a reference bundle id, now get the corresponding provisioning profile for this bundle id
             REF_PROVISION=$(provision_for_bundle_id "$REF_BUNDLE_ID")
             # Map to the new bundle id
             NEW_REF_BUNDLE_ID=$(bundle_id_for_provison "$REF_PROVISION")
             # Change if not the same and if doesn't contain wildcard
             # shellcheck disable=SC2049
-            if [[ "$REF_BUNDLE_ID" != "$NEW_REF_BUNDLE_ID" ]] && ! [[ "$NEW_REF_BUNDLE_ID" =~ \* ]];
-            then
+            if [[ "$REF_BUNDLE_ID" != "$NEW_REF_BUNDLE_ID" ]] && ! [[ "$NEW_REF_BUNDLE_ID" =~ \* ]]; then
                 log "Updating nested app or extension reference for ${key} key from ${REF_BUNDLE_ID} to ${NEW_REF_BUNDLE_ID}"
                 PlistBuddy -c "Set ${key} $NEW_REF_BUNDLE_ID" "$APP_PATH/Info.plist"
             fi
         fi
     done
 
-    if [ "$ENTITLEMENTS" != "" ];
-    then
-        if [ -n "$APP_IDENTIFIER_PREFIX" ];
-        then
+    if [ "$ENTITLEMENTS" != "" ]; then
+        if [ -n "$APP_IDENTIFIER_PREFIX" ]; then
             # sanity check the 'application-identifier' is present in the provided entitlements and matches the provisioning profile value
             ENTITLEMENTS_APP_ID_PREFIX=$(PlistBuddy -c "Print :application-identifier" "$ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n')
-            if [ "$ENTITLEMENTS_APP_ID_PREFIX" == "" ];
-            then
+            if [ "$ENTITLEMENTS_APP_ID_PREFIX" == "" ]; then
                 error "Provided entitlements file is missing a value for the required 'application-identifier' key"
-            elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFIER_PREFIX" ];
-            then
+            elif [ "$ENTITLEMENTS_APP_ID_PREFIX" != "$APP_IDENTIFIER_PREFIX" ]; then
                 error "Provided entitlements file's app identifier prefix value '$ENTITLEMENTS_APP_ID_PREFIX' does not match the provided provisioning profile's value '$APP_IDENTIFIER_PREFIX'"
             fi
         fi
 
-        if [ -n "$TEAM_IDENTIFIER" ];
-        then
+        if [ -n "$TEAM_IDENTIFIER" ]; then
             # sanity check the 'com.apple.developer.team-identifier' is present in the provided entitlements and matches the provisioning profile value
             ENTITLEMENTS_TEAM_IDENTIFIER=$(PlistBuddy -c "Print :com.apple.developer.team-identifier" "$ENTITLEMENTS" | tr -d '\n')
-            if [ "$ENTITLEMENTS_TEAM_IDENTIFIER" == "" ];
-            then
+            if [ "$ENTITLEMENTS_TEAM_IDENTIFIER" == "" ]; then
                 error "Provided entitlements file is missing a value for the required 'com.apple.developer.team-identifier' key"
-            elif [ "$ENTITLEMENTS_TEAM_IDENTIFIER" != "$TEAM_IDENTIFIER" ];
-            then
+            elif [ "$ENTITLEMENTS_TEAM_IDENTIFIER" != "$TEAM_IDENTIFIER" ]; then
                 error "Provided entitlements file's 'com.apple.developer.team-identifier' '$ENTITLEMENTS_TEAM_IDENTIFIER' does not match the provided provisioning profile's value '$TEAM_IDENTIFIER'"
             fi
         fi
@@ -615,8 +589,7 @@ function resign {
         cp -f "$ENTITLEMENTS" "$APP_PATH/archived-expanded-entitlements.xcent"
         /usr/bin/codesign ${VERBOSE} -f -s "$CERTIFICATE" --entitlements "$ENTITLEMENTS" "$APP_PATH"
         checkStatus
-    elif  [[ -n "${USE_APP_ENTITLEMENTS}" ]];
-    then
+    elif  [[ -n "${USE_APP_ENTITLEMENTS}" ]]; then
         # Extract entitlements from provisioning profile and from the app binary
         # then combine them together
 
@@ -828,7 +801,10 @@ function resign {
         checkStatus
         log "Resigning application using certificate: '$CERTIFICATE'"
         log "and entitlements from provisioning profile: $NEW_PROVISION"
-        cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
+        if [[ "${XCODE_VERSION/.*/}" -lt 10 ]]; then
+            log "Creating an archived-expanded-entitlements.xcent file for Xcode 9 builds or earlier"
+            cp -- "$TEMP_DIR/newEntitlements" "$APP_PATH/archived-expanded-entitlements.xcent"
+        fi
         # Must not qote KEYCHAIN_FLAG because it needs to be unwrapped and passed to codesign with spaces
         # shellcheck disable=SC2086
         /usr/bin/codesign ${VERBOSE} ${KEYCHAIN_FLAG} -f -s "$CERTIFICATE" --entitlements "$TEMP_DIR/newEntitlements" "$APP_PATH"