fastlane 2.82.0.beta.20180222010003 → 2.82.0.beta.20180223010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0071ace38acf8e4f22d7eff9f2981444490e2b8f
-  data.tar.gz: de15fafda10e49643d02cb3d889bfab577b5dc74
+  metadata.gz: ff02f04c2efc782d90b6082d827aa42b8779915c
+  data.tar.gz: 5c35f24eb249af77add3fa24d19c1f69411f3626
 SHA512:
-  metadata.gz: 5821d0f4d9811339dea1d80285c1b41408e57a811b64dc99479cde3ffb15cd716347ffe29652246acfaf9ba58b4a4edd636170763cab73eb283930c406029ab0
-  data.tar.gz: 56fa75771b88ae4135e9e69833e80db5cc92926bfbace671d06c6379c1b6cabd66218553ada1c8dbf577fc1eb00723bef63a196044ee6228611efab9b02eacfa
+  metadata.gz: 46efa7c14c4881c6d6d426295a48407ac3dd5ecfd9f56114d6191e5311cfeda40b9db46603464b0cf98ed1370991e1fcb4e46b21adb0e843007916328576ef03
+  data.tar.gz: 83647d742c6f92503ff756de030b72fedc698d40ba4d2dc190579e1e0184ff3c976366456099cb597214b26f7d5944ff986a8f158c5494911edfdf265751de2b

data/fastlane/lib/assets/ActionDetails.md.erb

@@ -44,10 +44,9 @@ Key | Description | Default
 <%- (action.available_options || []).each do |config_item| -%>
   <%- next unless config_item.kind_of?(FastlaneCore::ConfigItem) -%>
   <%- next if config_item.description.to_s.length == 0 -%>
-  `<%= config_item.key %>` | <%= config_item.description %> | <%= config_item.default_value.nil? ? "-" : (config_item.default_value_dynamic ? "*" : config_item.default_value) %>
+  `<%= config_item.key %>` | <%= config_item.description %> | <%= config_item.doc_default_value %>
 <%- end %>
-_- = this parameter doesn't have a default value_<br/>
-_* = this default value is dependent on the user's system_
+<em id="dynamic">* = default value is dependent on the user's system</em>
 <% end %><%# End of action.available_options... %>
 
 <hr />

data/fastlane/lib/fastlane/actions/add_git_tag.rb

@@ -46,7 +46,7 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :grouping,
                                        env_name: "FL_GIT_TAG_GROUPING",
-                                       description: "Is used to keep your tags organised under one 'folder'. Defaults to 'builds'",
+                                       description: "Is used to keep your tags organised under one 'folder'",
                                        default_value: 'builds'),
           FastlaneCore::ConfigItem.new(key: :prefix,
                                        env_name: "FL_GIT_TAG_PREFIX",
@@ -65,10 +65,12 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_GIT_TAG_MESSAGE",
                                        description: "The tag message. Defaults to the tag's name",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :commit,
                                        env_name: "FL_GIT_TAG_COMMIT",
                                        description: "The commit or object where the tag will be set. Defaults to the current HEAD",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_GIT_TAG_FORCE",

data/fastlane/lib/fastlane/actions/appetize.rb

@@ -115,7 +115,7 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :platform,
                                        env_name: "APPETIZE_PLATFORM",
-                                       description: "Platform. Either `ios` or `android`. Default is `ios`",
+                                       description: "Platform. Either `ios` or `android`",
                                        is_string: true,
                                        default_value: 'ios'),
           FastlaneCore::ConfigItem.new(key: :path,

data/fastlane/lib/fastlane/actions/backup_xcarchive.rb

@@ -82,17 +82,18 @@ module Fastlane
                                          UI.user_error!("Couldn't find the destination folder at '#{value}'") if !Helper.test? && !File.directory?(value) && !File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :zip,
-                                       description: 'Enable compression of the archive. Default value `true`',
+                                       description: 'Enable compression of the archive',
                                        is_string: false,
                                        default_value: true,
                                        optional: true,
                                        env_name: 'BACKUP_XCARCHIVE_ZIP'),
           FastlaneCore::ConfigItem.new(key: :zip_filename,
                                        description: 'Filename of the compressed archive. Will be appended by `.xcarchive.zip`. Default value is the output xcarchive filename',
+                                       default_value_dynamic: true,
                                        optional: true,
                                        env_name: 'BACKUP_XCARCHIVE_ZIP_FILENAME'),
           FastlaneCore::ConfigItem.new(key: :versioned,
-                                       description: 'Create a versioned (date and app version) subfolder where to put the archive. Default value `true`',
+                                       description: 'Create a versioned (date and app version) subfolder where to put the archive',
                                        is_string: false,
                                        default_value: true,
                                        optional: true,
@@ -120,7 +121,7 @@ module Fastlane
             xcarchive: "/path/to/file.xcarchive", # Optional if you use the `xcodebuild` action
             destination: "/somewhere/else/file.xcarchive", # Where the backup should be created
             zip: false, # Enable compression of the archive. Defaults to `true`.
-            versioned: true # Create a versioned (date and app version) subfolder where to put the archive. Default value `true`
+            versioned: true # Create a versioned (date and app version) subfolder where to put the archive
           )'
         ]
       end

data/fastlane/lib/fastlane/actions/commit_github_file.rb

@@ -126,6 +126,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_COMMIT_GITHUB_FILE_MESSAGE",
                                        description: "The commit message. Defaults to the file name",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :secure,
                                        env_name: "FL_COMMIT_GITHUB_FILE_SECURE",

data/fastlane/lib/fastlane/actions/docs/capture_ios_screenshots.md

@@ -221,6 +221,10 @@ fastlane snapshot reset_simulators
 
 You can use the environment variable `SNAPSHOT_FORCE_DELETE` to stop asking for confirmation before deleting.
 
+```no-highlight
+SNAPSHOT_FORCE_DELETE=1 fastlane snapshot reset_simulators
+```
+
 ## Update snapshot helpers
 
 Some updates require the helper files to be updated. _snapshot_ will automatically warn you and tell you how to update.

data/fastlane/lib/fastlane/actions/gradle.rb

@@ -113,7 +113,7 @@ module Fastlane
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :project_dir,
                                        env_name: 'FL_GRADLE_PROJECT_DIR',
-                                       description: 'The root directory of the gradle project. Defaults to `.`',
+                                       description: 'The root directory of the gradle project',
                                        default_value: '.',
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :gradle_path,

data/fastlane/lib/fastlane/actions/hg_push.rb

@@ -26,7 +26,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_HG_PUSH_FORCE",
-                                       description: "Force push to remote. Defaults to false",
+                                       description: "Force push to remote",
                                        is_string: false,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :destination,

data/fastlane/lib/fastlane/actions/import_from_git.rb

@@ -52,14 +52,14 @@ module Fastlane
         [
           'import_from_git(
             url: "git@github.com:fastlane/fastlane.git", # The URL of the repository to import the Fastfile from.
-            branch: "HEAD", # The branch to checkout on the repository. Defaults to `HEAD`.
-            path: "fastlane/Fastfile" # The path of the Fastfile in the repository. Defaults to `fastlane/Fastfile`.
+            branch: "HEAD", # The branch to checkout on the repository
+            path: "fastlane/Fastfile", # The path of the Fastfile in the repository
             version: "~> 1.0.0" # The version to checkout on the repository. Optimistic match operator can be used to select the latest version within constraints.
           )',
           'import_from_git(
             url: "git@github.com:fastlane/fastlane.git", # The URL of the repository to import the Fastfile from.
-            branch: "HEAD", # The branch to checkout on the repository. Defaults to `HEAD`.
-            path: "fastlane/Fastfile" # The path of the Fastfile in the repository. Defaults to `fastlane/Fastfile`.
+            branch: "HEAD", # The branch to checkout on the repository
+            path: "fastlane/Fastfile", # The path of the Fastfile in the repository
             version: [">= 1.1.0", "< 2.0.0"] # The version to checkout on the repository. Multiple conditions can be used to select the latest version within constraints.
           )'
         ]

data/fastlane/lib/fastlane/actions/ipa.rb

@@ -163,6 +163,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :destination,
                                        env_name: "IPA_DESTINATION",
                                        description: "Build destination. Defaults to current directory",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :embed,
                                        env_name: "IPA_EMBED",

data/fastlane/lib/fastlane/actions/nexus_upload.rb

@@ -107,7 +107,7 @@ module Fastlane
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :mount_path,
                                        env_name: "FL_NEXUS_MOUNT_PATH",
-                                       description: "Nexus mount path. Defaults to /nexus",
+                                       description: "Nexus mount path",
                                        default_value: "/nexus",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :username,

data/fastlane/lib/fastlane/actions/push_git_tags.rb

@@ -29,7 +29,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_PUSH_GIT_FORCE",
-                                       description: "Force push to remote. Defaults to false",
+                                       description: "Force push to remote",
                                        is_string: false,
                                        default_value: false,
                                        optional: true),

data/fastlane/lib/fastlane/actions/push_to_git_remote.rb

@@ -40,24 +40,26 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :local_branch,
                                        env_name: "FL_GIT_PUSH_LOCAL_BRANCH",
                                        description: "The local branch to push from. Defaults to the current branch",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :remote_branch,
                                        env_name: "FL_GIT_PUSH_REMOTE_BRANCH",
                                        description: "The remote branch to push to. Defaults to the local branch",
+                                       default_value_dynamic: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_PUSH_GIT_FORCE",
-                                       description: "Force push to remote. Defaults to false",
+                                       description: "Force push to remote",
                                        is_string: false,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :tags,
                                        env_name: "FL_PUSH_GIT_TAGS",
-                                       description: "Whether tags are pushed to remote. Defaults to true",
+                                       description: "Whether tags are pushed to remote",
                                        is_string: false,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :remote,
                                        env_name: "FL_GIT_PUSH_REMOTE",
-                                       description: "The remote to push to. Defaults to `origin`",
+                                       description: "The remote to push to",
                                        default_value: 'origin')
         ]
       end

data/fastlane/lib/fastlane/actions/reset_git_repo.rb

@@ -88,7 +88,7 @@ module Fastlane
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :skip_clean,
                                        env_name: "FL_RESET_GIT_SKIP_CLEAN",
-                                       description: "Skip 'git clean' to avoid removing untracked files like `.env`. Defaults to false",
+                                       description: "Skip 'git clean' to avoid removing untracked files like `.env`",
                                        is_string: false,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :disregard_gitignore,

data/fastlane/lib/fastlane/actions/update_fastlane.rb

@@ -134,7 +134,7 @@ module Fastlane
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :no_update,
                                        env_name: "FL_NO_UPDATE",
-                                       description: "Don't update during this run. Defaults to false. This is used internally",
+                                       description: "Don't update during this run. This is used internally",
                                        is_string: false,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :tools,

data/fastlane/lib/fastlane/documentation/actions_list.rb

@@ -135,7 +135,6 @@ module Fastlane
       else
         puts("No available options".yellow)
       end
-      puts("- = this parameter doesn't have a default value")
       puts("* = this default value is dependent on the user's system")
       puts("")
     end
@@ -192,11 +191,7 @@ module Fastlane
       if options.kind_of?(Array)
         options.each do |current|
           if current.kind_of?(FastlaneCore::ConfigItem)
-            current_default = current.default_value
-            # rubocop:disable Metrics/BlockNesting, Style/NestedTernaryOperator
-            default = current.default_value_dynamic ? "#{current_default} *".strip : (current_default.nil? ? "-" : current_default)
-            # rubocop:enable Metrics/BlockNesting, Style/NestedTernaryOperator
-            rows << [current.key.to_s.yellow, current.description, current.env_name, default]
+            rows << [current.key.to_s.yellow, current.description, current.env_name, current.help_default_value]
           elsif current.kind_of?(Array)
             # Legacy actions that don't use the new config manager
             UI.user_error!("Invalid number of elements in this row: #{current}. Must be 2 or 3") unless [2, 3].include?(current.count)

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.82.0.beta.20180222010003'.freeze
+  VERSION = '2.82.0.beta.20180223010003'.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_core/lib/fastlane_core/configuration/config_item.rb

@@ -277,5 +277,20 @@ module FastlaneCore
     def to_s
       [@key, @description].join(": ")
     end
+
+    def doc_default_value
+      return "[*](#dynamic)" if self.default_value_dynamic
+      return "" if self.default_value.nil?
+      return "`''`" if self.default_value.instance_of?(String) && self.default_value.empty?
+
+      "`#{self.default_value}`"
+    end
+
+    def help_default_value
+      return "#{self.default_value} *".strip if self.default_value_dynamic
+      return "" if self.default_value.nil?
+
+      self.default_value
+    end
   end
 end

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -23,10 +23,10 @@ module FastlaneCore
       #   "TimeToLive"=>185,
       #   "UUID"=>"1752e382-53bd-4910-a393-aaa7de0005ad",
       #   "Version"=>1}
-      def parse(path)
+      def parse(path, keychain_path = nil)
         require 'plist'
 
-        plist = Plist.parse_xml(decode(path))
+        plist = Plist.parse_xml(decode(path, keychain_path))
         if (plist || []).count > 5
           plist
         else
@@ -35,13 +35,13 @@ module FastlaneCore
       end
 
       # @return [String] The UUID of the given provisioning profile
-      def uuid(path)
-        parse(path).fetch("UUID")
+      def uuid(path, keychain_path = nil)
+        parse(path, keychain_path).fetch("UUID")
       end
 
       # @return [String] The Name of the given provisioning profile
-      def name(path)
-        parse(path).fetch("Name")
+      def name(path, keychain_path = nil)
+        parse(path, keychain_path).fetch("Name")
       end
 
       def profiles_path
@@ -55,9 +55,9 @@ module FastlaneCore
       end
 
       # Installs a provisioning profile for Xcode to use
-      def install(path)
+      def install(path, keychain_path = nil)
         UI.message("Installing provisioning profile...")
-        profile_filename = uuid(path) + ".mobileprovision"
+        profile_filename = uuid(path, keychain_path) + ".mobileprovision"
         destination = File.join(profiles_path, profile_filename)
 
         if path != destination
@@ -73,13 +73,17 @@ module FastlaneCore
 
       private
 
-      def decode(path)
+      def decode(path, keychain_path = nil)
         require 'tmpdir'
         Dir.mktmpdir('fastlane') do |dir|
           err = "#{dir}/cms.err"
           # we want to prevent the error output to mix up with the standard output because of
           # /dev/null: https://github.com/fastlane/fastlane/issues/6387
-          decoded = `security cms -D -i "#{path}" 2> #{err}`
+          if keychain_path.nil?
+            decoded = `security cms -D -i "#{path}" 2> #{err}`
+          else
+            decoded = `security cms -D -i "#{path}" -k "#{keychain_path.shellescape}" 2> #{err}`
+          end
           UI.error("Failure to decode #{path}. Exit: #{$?.exitstatus}: #{File.read(err)}") if $?.exitstatus != 0
           decoded
         end

data/gym/lib/gym/options.rb

@@ -67,6 +67,7 @@ module Gym
                                      short_option: "-q",
                                      env_name: "GYM_CONFIGURATION",
                                      description: "The configuration to use when building the app. Defaults to 'Release'",
+                                     default_value_dynamic: true,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :silent,
                                      short_option: "-a",

data/match/lib/match/runner.rb

@@ -135,13 +135,14 @@ module Match
       profile_name = names.join("_").gsub("*", '\*') # this is important, as it shouldn't be a wildcard
       base_dir = File.join(params[:workspace], "profiles", prov_type.to_s)
       profiles = Dir[File.join(base_dir, "#{profile_name}.mobileprovision")]
+      keychain_path = FastlaneCore::Helper.keychain_path(params[:keychain_name]) unless params[:keychain_name].nil?
 
       # Install the provisioning profiles
       profile = profiles.last
 
       if params[:force_for_new_devices] && !params[:readonly]
         if prov_type != :appstore
-          params[:force] = device_count_different?(profile: profile) unless params[:force]
+          params[:force] = device_count_different?(profile: profile, keychain_path: keychain_path) 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.
@@ -167,9 +168,8 @@ module Match
         self.files_to_commmit << profile
       end
 
-      installed_profile = FastlaneCore::ProvisioningProfile.install(profile)
-
-      parsed = FastlaneCore::ProvisioningProfile.parse(profile)
+      installed_profile = FastlaneCore::ProvisioningProfile.install(profile, keychain_path)
+      parsed = FastlaneCore::ProvisioningProfile.parse(profile, keychain_path)
       uuid = parsed["UUID"]
 
       if spaceship && !spaceship.profile_exists(username: params[:username], uuid: uuid)
@@ -204,9 +204,9 @@ module Match
       return uuid
     end
 
-    def device_count_different?(profile: nil)
+    def device_count_different?(profile: nil, keychain_path: nil)
       if profile
-        parsed = FastlaneCore::ProvisioningProfile.parse(profile)
+        parsed = FastlaneCore::ProvisioningProfile.parse(profile, keychain_path)
         uuid = parsed["UUID"]
         portal_profile = Spaceship.provisioning_profile.all.detect { |i| i.uuid == uuid }
 

data/pem/lib/pem/options.rb

@@ -22,7 +22,7 @@ module PEM
                                      default_value: true),
         FastlaneCore::ConfigItem.new(key: :active_days_limit,
                                      env_name: "PEM_ACTIVE_DAYS_LIMIT",
-                                     description: "If the current certificate is active for less than this number of days, generate a new one. Default value is 30 days",
+                                     description: "If the current certificate is active for less than this number of days, generate a new one",
                                      default_value: 30,
                                      is_string: false,
                                      type: Integer,

data/scan/lib/scan/options.rb

@@ -196,6 +196,7 @@ module Scan
                                      short_option: "-q",
                                      env_name: "SCAN_CONFIGURATION",
                                      description: "The configuration to use when building the app. Defaults to 'Release'",
+                                     default_value_dynamic: true,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :destination,
                                      short_option: "-d",

data/sigh/lib/assets/resign.sh

@@ -638,6 +638,71 @@ function resign {
         # Start with using what comes in provisioning profile entitlements before patching
         cp -f "$PROFILE_ENTITLEMENTS" "$PATCHED_ENTITLEMENTS"
 
+        log "Removing blacklisted keys from patched profile"
+        # See https://github.com/facebook/buck/issues/798 and https://github.com/facebook/buck/pull/802/files
+
+        # Update in https://github.com/facebook/buck/commit/99c0fbc3ab5ecf04d186913374f660683deccdef
+        # Update in https://github.com/facebook/buck/commit/36db188da9f6acbb9df419dc1904315ab00c4e19
+
+        # Buck changes referenced above are not self-explanatory and do not seem exhaustive or up-to-date
+        # Comments below explain the rules applied to each key in order to make realignment with future Xcode export logic easier
+        BLACKLISTED_KEYS=(\
+            # PP list identifiers inconsistent with app-defined ones and this key does not seem to appear in IPA entitlements, so ignore it
+            "com.apple.developer.icloud-container-development-container-identifiers" \
+            # This key has an invalid generic value in PP (actual value is set by Xcode during export), see dedicated processing a few blocks below
+            "com.apple.developer.icloud-container-environment" \
+            # PP list identifiers inconsistent with app-defined ones, must use App entitlements value
+            "com.apple.developer.icloud-container-identifiers" \
+            # PP enable all available services and not app-defined ones, must use App entitlements value
+            "com.apple.developer.icloud-services" \
+            # Was already blacklisted in previous version, but has someone ever seen this key in a PP?
+            "com.apple.developer.restricted-resource-mode" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.nfc.readersession.formats" \
+            # PP list a single TeamID.* identifier and not app-defined ones, must use App entitlements value
+            "com.apple.developer.pass-type-identifiers" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.siri" \
+            # PP list identifiers inconsistent with app-defined ones, must use App entitlements value
+            "com.apple.developer.ubiquity-container-identifiers" \
+            # PP define a generic TeamID.* identifier and not the app-defined one, must use App entitlements value
+            "com.apple.developer.ubiquity-kvstore-identifier" \
+            # If actually used by the App, this value will be set in its entitlements
+            "inter-app-audio" \
+            # PP define a generic TeamID.* identifier and not the app-defined one, must use App entitlements value
+            "keychain-access-groups" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.homekit" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.healthkit" \
+            # PP list identifiers inconsistent with app-defined ones, must use App entitlements value
+            "com.apple.developer.in-app-payments" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.networking.vpn.api" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.networking.HotspotConfiguration" \
+            # PP list all available extensions and not app-defined ones, must use App entitlements value
+            "com.apple.developer.networking.networkextension" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.networking.multipath" \
+            # PP enable all domains via a non-AppStore-compliant '*' value, must use App entitlements value
+            "com.apple.developer.associated-domains" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.developer.default-data-protection" \
+            # PP seem to list the same groups as the App, but use App entitlements value to be sure
+            "com.apple.security.application-groups" \
+            # Was already blacklisted in previous version, seems to be an artifact from an old Xcode release
+            "com.apple.developer.maps" \
+            # If actually used by the App, this value will be set in its entitlements
+            "com.apple.external-accessory.wireless-configuration"
+        )
+
+        # Blacklisted keys must not be included into new profile, so remove them from patched profile
+        for KEY in "${BLACKLISTED_KEYS[@]}"; do
+            log "Removing blacklisted key: $KEY"
+            PlistBuddy -c "Delete $KEY" "$PATCHED_ENTITLEMENTS" 2>/dev/null
+        done
+
         # Get the old and new app identifier (prefix)
         APP_ID_KEY="application-identifier"
         # Extract just the identifier from the value
@@ -664,13 +729,22 @@ function resign {
         # There can be only one ID_TYPE specified
         # If entitlements use more than one ID type for single entitlement, then this way of resigning will not work
         # instead an entitlements file must be provided explicitly
-        ENTITLEMENTS_TRANSFER_RULES=("com.apple.developer.associated-domains" \
+        ENTITLEMENTS_TRANSFER_RULES=(\
+            "com.apple.developer.associated-domains" \
+            "com.apple.developer.default-data-protection" \
             "com.apple.developer.healthkit" \
             "com.apple.developer.homekit" \
+            "com.apple.developer.icloud-container-environment" \
             "com.apple.developer.icloud-container-identifiers" \
             "com.apple.developer.icloud-services" \
             "com.apple.developer.in-app-payments" \
+            "com.apple.developer.networking.HotspotConfiguration" \
+            "com.apple.developer.networking.multipath" \
+            "com.apple.developer.networking.networkextension" \
             "com.apple.developer.networking.vpn.api" \
+            "com.apple.developer.nfc.readersession.formats" \
+            "com.apple.developer.pass-type-identifiers|TEAM_ID" \
+            "com.apple.developer.siri" \
             "com.apple.developer.ubiquity-container-identifiers" \
             "com.apple.developer.ubiquity-kvstore-identifier|TEAM_ID" \
             "com.apple.external-accessory.wireless-configuration" \
@@ -691,6 +765,22 @@ function resign {
                 continue
             fi
 
+            if [[ "$KEY" == "com.apple.developer.icloud-container-environment" ]]; then
+                # Add specific iCloud Environment key to patched entitlements
+                # This value is set by Xcode during export (manually selected for Development and AdHoc, automatically set to Production for Store)
+                # Would need an additional dedicated option to specify the iCloud environment to be used (Development or Production)
+                # For now, we assume Production is to be used when signing with a Distribution certificate, Development if not
+                if [[ "$CERTIFICATE" =~ "Distribution:" ]]; then
+                    ICLOUD_ENV="Production"
+                else
+                    ICLOUD_ENV="Development"
+                fi
+                log "Overriding value for $KEY"
+                log "Old value: $ENTITLEMENTS_VALUE"
+                log "New value: $ICLOUD_ENV"
+                ENTITLEMENTS_VALUE="$ICLOUD_ENV"
+            fi
+
             log "App entitlements value for key '$KEY':"
             log "$ENTITLEMENTS_VALUE"
 
@@ -711,7 +801,7 @@ function resign {
                 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"
             elif [[ "$ID_TYPE" == "TEAM_ID" ]]; then
-                # Replace new team identifier with new value
+                # 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"
             else
@@ -726,33 +816,6 @@ function resign {
         log "Replacing old bundle ID '$OLD_BUNDLE_ID' with new bundle ID '$NEW_BUNDLE_ID' in patched entitlements"
         sed -i .bak "s/$OLD_BUNDLE_ID/$NEW_BUNDLE_ID/g" "$PATCHED_ENTITLEMENTS"
 
-        log "Removing blacklisted keys from patched profile"
-        # See https://github.com/facebook/buck/issues/798 and https://github.com/facebook/buck/pull/802/files
-
-        # Update in https://github.com/facebook/buck/commit/99c0fbc3ab5ecf04d186913374f660683deccdef
-        # Update in https://github.com/facebook/buck/commit/36db188da9f6acbb9df419dc1904315ab00c4e19
-        BLACKLISTED_KEYS=(\
-            "com.apple.developer.icloud-container-development-container-identifiers" \
-            "com.apple.developer.icloud-container-environment" \
-            "com.apple.developer.icloud-container-identifiers" \
-            "com.apple.developer.icloud-services" \
-            "com.apple.developer.restricted-resource-mode" \
-            "com.apple.developer.ubiquity-container-identifiers" \
-            "com.apple.developer.ubiquity-kvstore-identifier" \
-            "inter-app-audio" \
-            "com.apple.developer.homekit" \
-            "com.apple.developer.healthkit" \
-            "com.apple.developer.in-app-payments" \
-            "com.apple.developer.maps" \
-            "com.apple.external-accessory.wireless-configuration"
-        )
-
-        # Blacklisted keys must not be included into new profile, so remove them from patched profile
-        for KEY in "${BLACKLISTED_KEYS[@]}"; do
-            log "Removing blacklisted key: $KEY"
-            PlistBuddy -c "Delete $KEY" "$PATCHED_ENTITLEMENTS" 2>/dev/null
-        done
-
         log "Resigning application using certificate: '$CERTIFICATE'"
         log "and patched entitlements:"
         log "$(cat "$PATCHED_ENTITLEMENTS")"

data/snapshot/lib/snapshot/options.rb

@@ -153,6 +153,7 @@ module Snapshot
                                      short_option: "-q",
                                      env_name: "SNAPSHOT_CONFIGURATION",
                                      description: "The configuration to use when building the app. Defaults to 'Release'",
+                                     default_value_dynamic: true,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :xcpretty_args,
                                      short_option: "-x",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.82.0.beta.20180222010003
+  version: 2.82.0.beta.20180223010003
 platform: ruby
 authors:
 - Olivier Halligon
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier