fastlane 1.63.1 → 1.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f856d6f6af4e0bf885b9472d0b1d4a935cb74ea4
-  data.tar.gz: b578b4713ef937a906cb21eb8851776c0802c9f3
+  metadata.gz: 45dd5cf53c7177ddb32515a4ea523968bed241e7
+  data.tar.gz: 6180e4b81438d84dddd2a2c90a92c98693519f88
 SHA512:
-  metadata.gz: a7356c5fa16111d39248728fe1eac89b4bdad3a1b7647153e9eafd163b0fc8d6284661e454c89024aae2ea7a8d20996a95633b6acfe49bfcab0ba852ff233d1b
-  data.tar.gz: 1ab07e603d5a0d08b1fae7ba9d3fe77430850f009fc1ecc9e17586fa207ed910dd6391a22e84f4b522356f0db6a87f62dd871f07dd29445363cf299a8d6aed75
+  metadata.gz: e345f385b400bfd8703fb8b65b5760a957e33d583e17f0c0439969e310cca79e7a13b0cf271da5095409e9cdbd21e349d20447689e17d63dbe7135596e64df0a
+  data.tar.gz: 6b14e133ff543454b3919295a6f67437636b817795bdcdc9718310ad68f30bdb3b9eb665c64261a745ae21bb770de897ca36d618257814b9350ee7616fe87af4

data/lib/fastlane/actions/badge.rb

@@ -12,7 +12,9 @@ module Fastlane
           alpha: params[:alpha],
           shield_io_timeout: params[:shield_io_timeout],
           glob: params[:glob],
-          alpha_channel: params[:alpha_channel]
+          alpha_channel: params[:alpha_channel],
+          shield_gravity: params[:shield_gravity],
+          shield_no_resize: params[:shield_no_resize]
         }
         Badge::Runner.new.run(params[:path], options)
       end
@@ -100,6 +102,19 @@ module Fastlane
                                        is_string: false,
                                        verify_block: proc do |value|
                                          raise "alpha_channel is only a flag and should always be true".red unless value == true
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :shield_gravity,
+                                       env_name: "FL_BADGE_SHIELD_GRAVITY",
+                                       description: "Position of shield on icon. Default: North - Choices include: NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :shield_no_resize,
+                                       env_name: "FL_BADGE_SHIELD_NO_RESIZE",
+                                       description: "Shield image will no longer be resized to aspect fill the full icon. Instead it will only be shrinked to not exceed the icon graphic",
+                                       optional: true,
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         raise "shield_no_resize is only a flag and should always be true".red unless value == true
                                        end)
         ]
       end

data/lib/fastlane/actions/get_build_number_repository.rb

@@ -0,0 +1,102 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      BUILD_NUMBER_REPOSITORY = :BUILD_NUMBER_REPOSITORY
+    end
+
+    class GetBuildNumberRepositoryAction < Action
+      def self.is_svn?
+        Actions.sh 'svn info'
+        return true
+      rescue
+        return false
+      end
+
+      def self.is_git?
+        Actions.sh 'git rev-parse HEAD'
+        return true
+      rescue
+        return false
+      end
+
+      def self.is_git_svn?
+        Actions.sh 'git svn info'
+        return true
+      rescue
+        return false
+      end
+
+      def self.is_hg?
+        Actions.sh 'hg status'
+        return true
+      rescue
+        return false
+      end
+
+      def self.command(use_hg_revision_number)
+        if is_svn?
+          UI.message "Detected repo: svn"
+          return 'svn info | grep Revision | egrep -o "[0-9]+"'
+        elsif is_git_svn?
+          UI.message "Detected repo: git-svn"
+          return 'git svn info | grep Revision | egrep -o "[0-9]+"'
+        elsif is_git?
+          UI.message "Detected repo: git"
+          return 'git rev-parse --short HEAD'
+        elsif is_hg?
+          UI.message "Detected repo: hg"
+          if use_hg_revision_number
+            return 'hg parent --template {rev}'
+          else
+            return 'hg parent --template "{node|short}"'
+          end
+        else
+          raise "No repository detected"
+        end
+      end
+
+      def self.run(params)
+        build_number = Action.sh command(params[:use_hg_revision_number])
+        Actions.lane_context[SharedValues::BUILD_NUMBER_REPOSITORY] = build_number
+        build_number
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Get the build number from the current repository"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :use_hg_revision_number,
+                                       env_name: "USE_HG_REVISION_NUMBER",
+                                       description: "Use hg revision number instead of hash (ignored for non-hg repos)",
+                                       optional: true,
+                                       is_string: false,
+                                       default_value: false)
+        ]
+      end
+
+      def self.output
+        [
+          ['BUILD_NUMBER_REPOSITORY', 'The build number from the current repository']
+        ]
+      end
+
+      def self.return_value
+        "The build number from the current repository"
+      end
+
+      def self.authors
+        ["bartoszj", "pbrooks", "armadsen"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include? platform
+      end
+    end
+  end
+end

data/lib/fastlane/actions/gradle.rb

@@ -1,36 +1,71 @@
+require 'pathname'
+require 'shellwords'
+
 module Fastlane
   module Actions
     module SharedValues
-      GRADLE_APK_OUTPUT_PATH = :APK_OUTPUT_PATH
+      GRADLE_APK_OUTPUT_PATH = :GRADLE_APK_OUTPUT_PATH
+      GRADLE_ALL_APK_OUTPUT_PATHS = :GRADLE_ALL_APK_OUTPUT_PATHS
       GRADLE_FLAVOR = :GRADLE_FLAVOR
+      GRADLE_BUILD_TYPE = :GRADLE_BUILD_TYPE
     end
 
     class GradleAction < Action
       def self.run(params)
         task = params[:task]
+        flavor = params[:flavor]
+        build_type = params[:build_type]
+
+        gradle_task = [task, flavor, build_type].join
+
+        project_dir = params[:project_dir]
+
+        gradle_path_param = params[:gradle_path] || './gradlew'
+
+        # Get the path to gradle, if it's an absolute path we take it as is, if it's relative we assume it's relative to the project_dir
+        gradle_path = if Pathname.new(gradle_path_param).absolute?
+                        File.expand_path(gradle_path_param)
+                      else
+                        File.expand_path(File.join(project_dir, gradle_path_param))
+                      end
+
+        # Ensure we ended up with a valid path to gradle
+        raise "Couldn't find gradlew at path '#{File.expand_path(gradle_path)}'".red unless File.exist?(gradle_path)
+
+        # Construct our flags
+        flags = []
+        flags << "-p #{project_dir.shellescape}"
+        flags << params[:properties].map { |k, v| "-P#{k}=#{v}" }.join(' ') unless params[:properties].nil?
+        flags << params[:flags] unless params[:flags].nil?
+
+        # Run the actual gradle task
+        gradle = Helper::GradleHelper.new(gradle_path: gradle_path)
+
+        # If these were set as properties, then we expose them back out as they might be useful to others
+        Actions.lane_context[SharedValues::GRADLE_BUILD_TYPE] = build_type if build_type
+        Actions.lane_context[SharedValues::GRADLE_FLAVOR] = flavor if flavor
+
+        # We run the actual gradle task
+        result = gradle.trigger(task: gradle_task, serial: params[:serial], flags: flags.join(' '))
+
+        # If we didn't build, then we return now, as it makes no sense to search for apk's in a non-`assemble` scenario
+        return result unless task.start_with?('assemble')
+
+        apk_search_path = File.join(project_dir, '*', 'build', 'outputs', 'apk', '*.apk')
+
+        # Our apk is now built, but there might actually be multiple ones that were built if a flavor was not specified in a multi-flavor project (e.g. `assembleRelease`), however we're not interested in unaligned apk's...
+        new_apks = Dir[apk_search_path].reject { |path| path =~ /^.*-unaligned.apk$/i}
+        new_apks = new_apks.map { |path| File.expand_path(path)}
 
-        gradle = Helper::GradleHelper.new(gradle_path: params[:gradle_path])
-
-        result = gradle.trigger(task: task, flags: params[:flags], serial: params[:serial])
-
-        return result unless task.start_with?("assemble")
-
-        # We built our app. Store the path to the apk
-        flavor = task.match(/assemble(\w*)/)
-        if flavor and flavor[1]
-          flavor = flavor[1].downcase # Release => release
-          apk_path = Dir[File.join("app", "build", "outputs", "apk", "*-#{flavor}.apk")].last
-          if apk_path
-            Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] = File.expand_path(apk_path)
-          else
-            Helper.log.info "Couldn't find signed apk file at path '#{apk_path}'...".red
-            if flavor == 'release'
-              Helper.log.info "Make sure to enable code signing in your gradle task: ".red
-              Helper.log.info "https://stackoverflow.com/questions/18328730/how-to-create-a-release-signed-apk-file-using-gradle".red
-            end
-          end
-          Actions.lane_context[SharedValues::GRADLE_FLAVOR] = flavor
-        end
+        # We expose all of these new apk's
+        Actions.lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = new_apks
+
+        # We also take the most recent apk to return as SharedValues::GRADLE_APK_OUTPUT_PATH, this is the one that will be relevant for most projects that just build a single build variant (flavor + build type combo). In multi build variants this value is undefined
+        last_apk_path = new_apks.sort_by(&File.method(:mtime)).last
+        Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] = File.expand_path(last_apk_path) if last_apk_path
+
+        # Give a helpful message in case there were no new apk's. Remember we're only running this code when assembling, in which case we certainly expect there to be an apk
+        Helper.log.info 'Couldn\'t find any new signed apk files...'.red if new_apks.empty?
 
         return result
       end
@@ -40,54 +75,75 @@ module Fastlane
       #####################################################
 
       def self.description
-        "All gradle related actions, including building and testing your Android app"
+        'All gradle related actions, including building and testing your Android app'
       end
 
       def self.details
         [
-          "Run `./gradlew tasks` to get a list of all available gradle tasks for your project"
+          'Run `./gradlew tasks` to get a list of all available gradle tasks for your project'
         ].join("\n")
       end
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :serial,
-                                       env_name: "FL_ANDROID_SERIAL",
-                                       description: "Android serial, wich device should be used for this command",
-                                       is_string: true,
-                                       default_value: ""),
           FastlaneCore::ConfigItem.new(key: :task,
-                                       env_name: "FL_GRADLE_TASK",
-                                       description: "The gradle task you want to execute",
+                                       env_name: 'FL_GRADLE_TASK',
+                                       description: 'The gradle task you want to execute, e.g. `assemble` or `test`. For tasks such as `assembleMyFlavorRelease` you should use gradle(task: \'assemble\', flavor: \'Myflavor\', build_type: \'Release\')',
+                                       optional: false,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                       env_name: 'FL_GRADLE_FLAVOR',
+                                       description: 'The flavor that you want the task for, e.g. `MyFlavor`. If you are running the `assemble` task in a multi-flavor project, and you rely on Actions.lane_context[Actions.SharedValues::GRADLE_APK_OUTPUT_PATH] then you must specify a flavor here or else this value will be undefined',
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :build_type,
+                                       env_name: 'FL_GRADLE_BUILD_TYPE',
+                                       description: 'The build type that you want the task for, e.g. `Release`. Useful for some tasks such as `assemble`',
+                                       optional: true,
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :flags,
-                                       env_name: "FL_GRADLE_FLAGS",
-                                       description: "All parameter flags you want to pass to the gradle command, e.g. `--exitcode --xml file.xml`",
+                                       env_name: 'FL_GRADLE_FLAGS',
+                                       description: 'All parameter flags you want to pass to the gradle command, e.g. `--exitcode --xml file.xml`',
                                        optional: true,
                                        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 `.`',
+                                       default_value: '.',
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :gradle_path,
-                                       env_name: "FL_GRADLE_PATH",
-                                       description: "The path to your `gradlew`",
+                                       env_name: 'FL_GRADLE_PATH',
+                                       description: 'The path to your `gradlew`. If you specify a relative path, it is assumed to be relative to the `project_dir`',
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :properties,
+                                       env_name: 'FL_GRADLE_PROPERTIES',
+                                       description: 'Gradle properties to be exposed to the gradle script',
+                                       optional: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :serial,
+                                       env_name: 'FL_ANDROID_SERIAL',
+                                       description: 'Android serial, wich device should be used for this command',
                                        is_string: true,
-                                       default_value: Dir["./gradlew"].last, # Using Dir to be nil when the file doesn't exist (import for validation)
-                                       verify_block: proc do |value|
-                                         raise "Couldn't find gradlew at path '#{File.expand_path(value)}'".red unless File.exist?(value)
-                                       end)
+                                       default_value: '')
         ]
       end
 
       def self.output
         [
-          ['GRADLE_APK_OUTPUT_PATH', 'The path to the newly generated apk file']
+          ['GRADLE_APK_OUTPUT_PATH', 'The path to the newly generated apk file. Undefined in a multi-variant assemble scenario'],
+          ['GRADLE_ALL_APK_OUTPUT_PATHS', 'When running a multi-variant `assemble`, the array of signed apk\'s that were generated'],
+          ['GRADLE_FLAVOR', 'The flavor, e.g. `MyFlavor`'],
+          ['GRADLE_BUILD_TYPE', 'The build type, e.g. `Release`']
         ]
       end
 
       def self.return_value
-        "The output of running the gradle task"
+        'The output of running the gradle task'
       end
 
       def self.authors
-        ["KrauseFx"]
+        ['KrauseFx', 'lmirosevic']
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/actions/latest_testflight_build_number.rb

@@ -30,7 +30,12 @@ module Fastlane
         Helper.log.info "Fetching the latest build number for version #{version_number}"
 
         train = app.build_trains[version_number]
-        build_number = train.builds.map(&:build_version).map(&:to_i).sort.last
+        begin
+          build_number = train.builds.map(&:build_version).map(&:to_i).sort.last
+        rescue
+          raise "could not find a build on iTC - and 'initial_build_number' option is not set" unless params[:initial_build_number]
+          build_number = params[:initial_build_number]
+        end
 
         Helper.log.info "Latest upload is build number: #{build_number}"
         Actions.lane_context[SharedValues::LATEST_TESTFLIGHT_BUILD_NUMBER] = build_number
@@ -66,7 +71,13 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "LATEST_VERSION",
                                        description: "The version number whose latest build number we want",
-                                       optional: true)
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :initial_build_number,
+                                       env_name: "INTITIAL_BUILD_NUMBER",
+                                       description: "sets the build number to given value if no build is in current train",
+                                       optional: true,
+                                       is_string: false)
+
         ]
       end
 

data/lib/fastlane/actions/mailgun.rb

@@ -75,6 +75,11 @@ module Fastlane
                                       env_name: "MAILGUN_CI_BUILD_LINK",
                                       description: "CI Build Link",
                                       optional: true,
+                                      is_string: true),
+          FastlaneCore::ConfigItem.new(key: :template_path,
+                                      env_name: "MAILGUN_TEMPLATE_PATH",
+                                      description: "Mail HTML template",
+                                      optional: true,
                                       is_string: true)
 
         ]
@@ -98,11 +103,11 @@ module Fastlane
                         from: "#{options[:from]}<#{options[:postmaster]}>",
                         to: "#{options[:to]}",
                         subject: options[:subject],
-                        html: mail_teplate(options)
-        mail_teplate(options)
+                        html: mail_template(options)
+        mail_template(options)
       end
 
-      def self.mail_teplate(options)
+      def self.mail_template(options)
         hash = {
           author: Actions.git_author_email,
           last_commit: Actions.last_git_commit_message,
@@ -111,10 +116,18 @@ module Fastlane
         }
         hash[:success] = options[:success]
         hash[:ci_build_link] = options[:ci_build_link]
-        Fastlane::ErbTemplateHelper.render(
-          Fastlane::ErbTemplateHelper.load("mailgun_html_template"),
-          hash
-        )
+
+        # grabs module
+        eth = Fastlane::ErbTemplateHelper
+
+        # create html from template
+        html_template_path = options[:template_path]
+        if html_template_path && File.exist?(html_template_path)
+          html_template = eth.load_from_path(html_template_path)
+        else
+          html_template = eth.load("mailgun_html_template")
+        end
+        eth.render(html_template, hash)
       end
 
     end

data/lib/fastlane/actions/oclint.rb

@@ -7,8 +7,9 @@ module Fastlane
 
     class OclintAction < Action
       def self.run(params)
-        if `which oclint`.to_s.length == 0 and !Helper.test?
-          raise "You have to install oclint. Fore more details: ".red + "http://docs.oclint.org/en/stable/intro/installation.html".yellow
+        oclint_path = params[:oclint_path]
+        if `which #{oclint_path}`.to_s.empty? and !Helper.test?
+          raise "You have to install oclint or provide path to oclint binary. Fore more details: ".red + "http://docs.oclint.org/en/stable/intro/installation.html".yellow
         end
 
         compile_commands = params[:compile_commands]
@@ -64,7 +65,7 @@ module Fastlane
 
         command = [
           command_prefix,
-          'oclint',
+          oclint_path,
           oclint_args,
           '"' + files.join('" "') + '"'
         ].join(' ')
@@ -84,6 +85,11 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(key: :oclint_path,
+                                       env_name: 'FL_OCLINT_PATH',
+                                       description: 'The path to oclint binary',
+                                       default_value: 'oclint',
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :compile_commands,
                                        env_name: 'FL_OCLINT_COMPILE_COMMANDS',
                                        description: 'The json compilation database, use xctool reporter \'json-compilation-database\'',

data/lib/fastlane/actions/s3.rb

@@ -231,6 +231,16 @@ module Fastlane
         html_obj = bucket.objects.create(html_file_name, html_render.to_s, acl: :public_read)
         version_obj = bucket.objects.create(version_file_name, version_render.to_s, acl: :public_read)
 
+        # When you enable versioning on a S3 bucket,
+        # writing to an object will create an object version
+        # instead of replacing the existing object.
+        # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
+        if plist_obj.kind_of? AWS::S3::ObjectVersion
+          plist_obj = plist_obj.object
+          html_obj = html_obj.object
+          version_obj = version_obj.object
+        end
+
         # Setting actionand environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_obj.public_url.to_s
         ENV[SharedValues::S3_PLIST_OUTPUT_PATH.to_s] = plist_obj.public_url.to_s
@@ -241,7 +251,7 @@ module Fastlane
         Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_obj.public_url.to_s
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_obj.public_url.to_s
 
-        Helper.log.info "Successfully uploaded ipa file to '#{html_obj.public_url}'".green
+        Helper.log.info "Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'".green
       end
 
       #

data/lib/fastlane/actions/set_build_number_repository.rb

@@ -8,56 +8,10 @@ module Fastlane
         [:ios, :mac].include? platform
       end
 
-      def self.is_svn?
-        Actions.sh 'svn info'
-        return true
-      rescue
-        return false
-      end
-
-      def self.is_git?
-        Actions.sh 'git rev-parse HEAD'
-        return true
-      rescue
-        return false
-      end
-
-      def self.is_git_svn?
-        Actions.sh 'git svn info'
-        return true
-      rescue
-        return false
-      end
-
-      def self.is_hg?
-        Actions.sh 'hg status'
-        return true
-      rescue
-        return false
-      end
-
       def self.run(params)
-        if is_svn?
-          Helper.log.info "Detected repo: svn"
-          command = 'svn info | grep Revision | egrep -o "[0-9]+"'
-        elsif is_git_svn?
-          Helper.log.info "Detected repo: git-svn"
-          command = 'git svn info | grep Revision | egrep -o "[0-9]+"'
-        elsif is_git?
-          Helper.log.info "Detected repo: git"
-          command = 'git rev-parse --short HEAD'
-        elsif is_hg?
-          Helper.log.info "Detected repo: hg"
-          if params[:use_hg_revision_number]
-            command = 'hg parent --template {rev}'
-          else
-            command = 'hg parent --template "{node|short}"'
-          end
-        else
-          raise "No repository detected"
-        end
-
-        build_number = Actions.sh command
+        build_number = Fastlane::Actions::GetBuildNumberRepositoryAction.run(
+          use_hg_revision_number: params[:use_hg_revision_number]
+        )
 
         Fastlane::Actions::IncrementBuildNumberAction.run(build_number: build_number)
       end

data/lib/fastlane/actions/update_icloud_container_identifiers.rb

@@ -0,0 +1,80 @@
+module Fastlane
+  module Actions
+    module SharedValues
+      UPDATE_ICLOUD_CONTAINER_IDENTIFIERS = :UPDATE_ICLOUD_CONTAINER_IDENTIFIERS
+    end
+
+    class UpdateIcloudContainerIdentifiersAction < Action
+      require 'plist'
+
+      def self.run(params)
+        entitlements_file = params[:entitlements_file]
+        UI.message "Entitlements File: #{entitlements_file}"
+
+        # parse entitlements
+        result = Plist.parse_xml(entitlements_file)
+        UI.error "Entitlements file at '#{entitlements_file}' cannot be parsed." unless result
+
+        # get iCloud container field
+        icloud_container_key = 'com.apple.developer.icloud-container-identifiers'
+        icloud_container_value = result[icloud_container_key]
+        UI.error "No existing iCloud container field specified. Please specify an iCloud container in the entitlements file." unless icloud_container_value
+
+        # get uniquity container field
+        ubiquity_container_key = 'com.apple.developer.ubiquity-container-identifiers'
+        ubiquity_container_value = result[ubiquity_container_key]
+        UI.error "No existing ubiquity container field specified. Please specify an ubiquity container in the entitlements file." unless ubiquity_container_value
+
+        # set iCloud container identifiers
+        result[icloud_container_key] = params[:icloud_container_identifiers]
+        result[ubiquity_container_key] = params[:icloud_container_identifiers]
+
+        # save entitlements file
+        result.save_plist(entitlements_file)
+
+        UI.message "Old iCloud Container Identifiers: #{icloud_container_value}"
+        UI.message "Old Ubiquity Container Identifiers: #{ubiquity_container_value}"
+
+        UI.success "New iCloud Container Identifiers set: #{result[icloud_container_key]}"
+        UI.success "New Ubiquity Container Identifiers set: #{result[ubiquity_container_key]}"
+
+        Actions.lane_context[SharedValues::UPDATE_ICLOUD_CONTAINER_IDENTIFIERS] = result[icloud_container_key]
+      end
+
+      def self.description
+        "This action changes the iCloud container identifiers in the entitlements file"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :entitlements_file,
+                                       env_name: "FL_UPDATE_ICLOUD_CONTAINER_IDENTIFIERS_ENTITLEMENTS_FILE_PATH",
+                                       description: "The path to the entitlement file which contains the iCloud container identifiers",
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Please pass a path to an entitlements file. ") unless value.include? ".entitlements"
+                                         UI.user_error!("Could not find entitlements file") if !File.exist?(value) and !Helper.is_test?
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :icloud_container_identifiers,
+                                       env_name: "FL_UPDATE_ICLOUD_CONTAINER_IDENTIFIERS_IDENTIFIERS",
+                                       description: "An Array of unique identifiers for the iCloud containers. Eg. ['iCloud.com.test.testapp']",
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("The parameter icloud_container_identifiers needs to be an Array.") unless value.kind_of? Array
+                                       end)
+        ]
+      end
+
+      def self.output
+        ['UPDATE_ICLOUD_CONTAINER_IDENTIFIERS', 'The new iCloud Container Identifiers']
+      end
+
+      def self.authors
+        ["JamesKuang"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/actions/verify_build.rb

@@ -9,7 +9,7 @@ module Fastlane
     class VerifyBuildAction < Action
       def self.run(params)
         Dir.mktmpdir do |dir|
-          app_path = self.app_path(dir)
+          app_path = self.app_path(params, dir)
 
           values = self.gather_cert_info(app_path)
 
@@ -21,8 +21,8 @@ module Fastlane
         end
       end
 
-      def self.app_path(dir)
-        ipa_path = Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] || ''
+      def self.app_path(params, dir)
+        ipa_path = params[:ipa_path] || Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] || ''
         raise "Unable to find ipa file '#{ipa_path}'." unless File.exist?(ipa_path)
         ipa_path = File.expand_path(ipa_path)
 
@@ -67,7 +67,10 @@ module Fastlane
         values['provisioning_uuid'] = plist['UUID']
         values['team_name'] = plist['TeamName']
 
-        raise "Inconsistent identifier found" unless plist['Entitlements']['application-identifier'] == "#{values['team_identifier']}.#{values['bundle_identifier']}"
+        application_identifier_prefix = plist['ApplicationIdentifierPrefix'][0]
+        full_bundle_identifier = "#{application_identifier_prefix}.#{values['bundle_identifier']}"
+
+        raise "Inconsistent identifier found; #{plist['Entitlements']['application-identifier']}, found in the embedded.mobileprovision file, should match #{full_bundle_identifier}, which is embedded in the codesign identity" unless plist['Entitlements']['application-identifier'] == full_bundle_identifier
         raise "Inconsistent identifier found" unless plist['Entitlements']['com.apple.developer.team-identifier'] == values['team_identifier']
 
         values
@@ -100,22 +103,22 @@ module Fastlane
 
       def self.evaulate(params, values)
         if params[:provisioning_type]
-          raise "Mismatched provisioning_type '#{params[:provisioning_type]}'".red unless params[:provisioning_type] == values['provisioning_type']
+          raise "Mismatched provisioning_type. Required: '#{params[:provisioning_type]}''; Found: '#{values['provisioning_type']}'".red unless params[:provisioning_type] == values['provisioning_type']
         end
         if params[:provisioning_uuid]
-          raise "Mismatched provisioning_uuid '#{params[:provisioning_uuid]}'".red unless params[:provisioning_uuid] == values['provisioning_uuid']
+          raise "Mismatched provisioning_uuid. Required: '#{params[:provisioning_uuid]}'; Found: '#{values['provisioning_uuid']}'".red unless params[:provisioning_uuid] == values['provisioning_uuid']
         end
         if params[:team_identifier]
-          raise "Mismatched team_identifier '#{params[:team_identifier]}'".red unless params[:team_identifier] == values['team_identifier']
+          raise "Mismatched team_identifier. Required: '#{params[:team_identifier]}'; Found: '#{values['team_identifier']}'".red unless params[:team_identifier] == values['team_identifier']
         end
         if params[:team_name]
-          raise "Mismatched team_name '#{params[:team_name]}'".red unless params[:team_name] == values['team_name']
+          raise "Mismatched team_name. Required: '#{params[:team_name]}'; Found: 'values['team_name']'".red unless params[:team_name] == values['team_name']
         end
         if params[:app_name]
-          raise "Mismatched app_name '#{params[:app_name]}'".red unless params[:app_name] == values['app_name']
+          raise "Mismatched app_name. Required: '#{params[:app_name]}'; Found: '#{values['app_name']}'".red unless params[:app_name] == values['app_name']
         end
         if params[:bundle_identifier]
-          raise "Mismatched bundle_identifier '#{params[:bundle_identifier]}'".red unless params[:bundle_identifier] == values['bundle_identifier']
+          raise "Mismatched bundle_identifier. Required: '#{params[:bundle_identifier]}'; Found: '#{values['bundle_identifier']}'".red unless params[:bundle_identifier] == values['bundle_identifier']
         end
 
         UI.success "Build is verified, have a 🍪."
@@ -161,6 +164,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :bundle_identifier,
                                        env_name: "FL_VERIFY_BUILD_BUNDLE_IDENTIFIER",
                                        description: "Required bundle identifier",
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :ipa_path,
+                                       env_name: "FL_VERIFY_BUILD_IPA_PATH",
+                                       description: "Explicitly set the ipa path",
                                        optional: true)
         ]
       end

data/lib/fastlane/helper/gradle_helper.rb

@@ -23,10 +23,11 @@ module Fastlane
       end
 
       # Run a certain action
-      def trigger(task: nil, flags: nil, serial:nil)
+      def trigger(task: nil, flags: nil, serial: nil)
         # raise "Could not find gradle task '#{task}' in the list of available tasks".red unless task_available?(task)
-        android_serial = serial != "" ? "ANDROID_SERIAL=#{serial}" : nil
-        command = [android_serial, gradle_path, task, flags].join(" ")
+
+        android_serial = (serial != "") ? "ANDROID_SERIAL=#{serial}" : nil
+        command = [android_serial, gradle_path, task, flags].reject(&:nil?).join(" ")
         Action.sh(command)
       end
 

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.63.1'.freeze
+  VERSION = '1.64.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.63.1
+  version: 1.64.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krausefx-shenzhen
@@ -673,6 +673,7 @@ files:
 - lib/fastlane/actions/frameit.rb
 - lib/fastlane/actions/gcovr.rb
 - lib/fastlane/actions/get_build_number.rb
+- lib/fastlane/actions/get_build_number_repository.rb
 - lib/fastlane/actions/get_github_release.rb
 - lib/fastlane/actions/get_info_plist_value.rb
 - lib/fastlane/actions/get_ipa_info_plist_value.rb
@@ -763,6 +764,7 @@ files:
 - lib/fastlane/actions/update_app_group_identifiers.rb
 - lib/fastlane/actions/update_app_identifier.rb
 - lib/fastlane/actions/update_fastlane.rb
+- lib/fastlane/actions/update_icloud_container_identifiers.rb
 - lib/fastlane/actions/update_info_plist.rb
 - lib/fastlane/actions/update_project_code_signing.rb
 - lib/fastlane/actions/update_project_provisioning.rb
@@ -828,7 +830,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Connect all iOS deployment tools into one streamlined workflow