fastlane 2.129.0.beta.20190811200106 → 2.129.0.beta.20190813200016

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f49f85f33f71ee3a54f4324ded48ba8503a8ce
-  data.tar.gz: c159f08671231c2601c68e204cd9a481f9d84658
+  metadata.gz: 1b1f0d75e2cef96d9d66abd38b3d8f421ef561e8
+  data.tar.gz: 056af703f6e8ba46111b997331b1bfad37a9c042
 SHA512:
-  metadata.gz: 43be43f0a5a30249820b1118e591edaad36c722856a92744757cd77de19dde19ac00b013748cd61156bd496d8e577b8b10cd526b56d45da8ee37b8f9d4cd07fa
-  data.tar.gz: 9b73bec5130415cfc6df8a5038e2597aa05245cff752a50d833ef9431d14df597ee821f9314c519c77921848e89338b3a78dd60451a8ba1a381adf8af6044335
+  metadata.gz: '09e2b9151be73aae01748f211df62a622a419332da4d7113f05d691b8f872b774072bf72c0454b97cefe4e8505f8bb28a458380efe0cd21927433d93c134b936'
+  data.tar.gz: 896ed6d895e3c8f16b507c499ae8029ff5870a389d6a85fc246a4464491b60963ee7f09c3d897893330beca522a00571f1163bf8cfb06767f85179d213b12a39

data/deliver/lib/deliver/submit_for_review.rb

@@ -59,7 +59,7 @@ module Deliver
       build = nil
 
       loop do
-        # Sometimes candidate_builds don't appear immediately after submittion
+        # Sometimes candidate_builds don't appear immediately after submission
         # Wait for candidate_builds to appear on App Store Connect
         # Issue https://github.com/fastlane/fastlane/issues/10411
         candidate_builds = app.latest_version.candidate_builds

data/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb

@@ -115,7 +115,7 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :params,
                                        env_name: "APPETIZE_VIEWING_URL_GENERATOR_PARAMS",
-                                       description: "Specifiy params value to be passed to Appetize",
+                                       description: "Specify params value to be passed to Appetize",
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :proxy,

data/fastlane/lib/fastlane/actions/automatic_code_signing.rb

@@ -50,7 +50,7 @@ module Fastlane
           if params[:code_sign_identity]
             build_configuration_list.set_setting("CODE_SIGN_IDENTITY", params[:code_sign_identity])
 
-            # We also need to update the value if it was overriden for a specific SDK
+            # We also need to update the value if it was overridden for a specific SDK
             build_configuration_list.build_configurations.each do |build_configuration|
               codesign_build_settings_keys = build_configuration.build_settings.keys.select { |key| key.to_s.match(/CODE_SIGN_IDENTITY.*/) }
               codesign_build_settings_keys.each do |setting|

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

@@ -50,7 +50,7 @@ module Fastlane
             end
           }
         }) do |result|
-          UI.success("Successfully commited file to GitHub")
+          UI.success("Successfully committed file to GitHub")
           json = result[:json]
           html_url = json['commit']['html_url']
           download_url = json['content']['download_url']

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -16,7 +16,12 @@ module Fastlane
         project = get_project!(folder)
         target = get_target!(project, target_name)
         plist_file = get_plist!(folder, target, configuration)
-        version_number = get_version_number!(plist_file)
+        version_number = get_version_number_from_plist!(plist_file)
+
+        # Get from build settings if needed (ex: $(MARKETING_VERSION) is default in Xcode 11)
+        if version_number =~ /\$\(([\w\-]+)\)/
+          version_number = get_version_number_from_build_settings!(target, $1, configuration)
+        end
 
         # Store the number in the shared hash
         Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
@@ -65,6 +70,17 @@ module Fastlane
         target
       end
 
+      def self.get_version_number_from_build_settings!(target, variable, configuration = nil)
+        target.build_configurations.each do |config|
+          if configuration.nil? || config.name == configuration
+            value = config.build_settings[variable]
+            return value if value
+          end
+        end
+
+        UI.user_error!("Unable to find Xcode build setting: #{variable}")
+      end
+
       def self.get_plist!(folder, target, configuration = nil)
         plist_files = target.resolved_build_setting("INFOPLIST_FILE")
         plist_files_count = plist_files.values.compact.uniq.count
@@ -94,7 +110,7 @@ module Fastlane
         plist_file
       end
 
-      def self.get_version_number!(plist_file)
+      def self.get_version_number_from_plist!(plist_file)
         plist = Xcodeproj::Plist.read_from_path(plist_file)
         UI.user_error!("Unable to read plist: #{plist_file}") unless plist
 

data/fastlane/lib/fastlane/actions/github_api.rb

@@ -113,7 +113,7 @@ module Fastlane
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :raw_body,
                                          env_name: "FL_GITHUB_API_REQUEST_RAW_BODY",
-                                         description: "The request body taken vertabim instead of as JSON, useful for file uploads",
+                                         description: "The request body taken verbatim instead of as JSON, useful for file uploads",
                                          is_string: true,
                                          optional: true),
             FastlaneCore::ConfigItem.new(key: :path,

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

@@ -102,7 +102,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :task,
                                        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\')',
+                                       description: 'The gradle task you want to execute, e.g. `assemble`, `bundle` 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,
@@ -187,8 +187,21 @@ module Fastlane
             task: "assemble",
             flavor: "WorldDomination",
             build_type: "Release"
-          )',
-          'gradle(
+          )
+          ```
+
+          To build an AAB use:
+          ```ruby
+          gradle(
+            task: "bundle",
+            flavor: "WorldDomination",
+            build_type: "Release"
+          )
+          ```
+
+          You can pass properties to gradle:
+          ```ruby
+          gradle(
             # ...
 
             properties: {
@@ -211,8 +224,11 @@ module Fastlane
               "android.injected.signing.key.alias" => "key_alias",
               "android.injected.signing.key.password" => "key_password",
             }
-          )',
-          '# If you need to pass sensitive information through the `gradle` action, and don\'t want the generated command to be printed before it is run, you can suppress that:
+          )
+          ```
+
+          If you need to pass sensitive information through the `gradle` action, and don\'t want the generated command to be printed before it is run, you can suppress that:
+          ```ruby
           gradle(
             # ...
             print_command: false
@@ -233,8 +249,11 @@ module Fastlane
             # ...
 
             flags: "--exitcode --xml file.xml"
-          )',
-          '# Delete the build directory and generated APKs
+          )
+          ```
+
+          Delete the build directory, generated APKs and AABs
+          ```ruby
           gradle(
             task: "clean"
           )'

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

@@ -31,7 +31,7 @@ module Fastlane
                                        default_value: 'fastlane/Fastfile',
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :version,
-                                       description: "The version to checkout on the respository. Optimistic match operator or multiple conditions can be used to select the latest version within constraints",
+                                       description: "The version to checkout on the repository. Optimistic match operator or multiple conditions can be used to select the latest version within constraints",
                                        default_value: nil,
                                        is_string: false,
                                        optional: true)

data/fastlane/lib/fastlane/actions/pod_push.rb

@@ -65,25 +65,30 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :use_bundle_exec,
                                          description: "Use bundle exec when there is a Gemfile presented",
                                          type: Boolean,
-                                         default_value: false),
+                                         default_value: false,
+                                         env_name: "FL_POD_PUSH_USE_BUNDLE_EXEC"),
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The Podspec you want to push",
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
                                          UI.user_error!("File must be a `.podspec` or `.podspec.json`") unless value.end_with?(".podspec", ".podspec.json")
-                                       end),
+                                       end,
+                                       env_name: "FL_POD_PUSH_PATH"),
           FastlaneCore::ConfigItem.new(key: :repo,
                                        description: "The repo you want to push. Pushes to Trunk by default",
-                                       optional: true),
+                                       optional: true,
+                                       env_name: "FL_POD_PUSH_REPO"),
           FastlaneCore::ConfigItem.new(key: :allow_warnings,
                                        description: "Allow warnings during pod push",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_ALLOW_WARNINGS"),
           FastlaneCore::ConfigItem.new(key: :use_libraries,
                                        description: "Allow lint to use static libraries to install the spec",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_USE_LIBRARIES"),
           FastlaneCore::ConfigItem.new(key: :sources,
                                        description: "The sources of repos you want the pod spec to lint with, separated by commas",
                                        optional: true,
@@ -91,24 +96,29 @@ module Fastlane
                                        type: Array,
                                        verify_block: proc do |value|
                                          UI.user_error!("Sources must be an array.") unless value.kind_of?(Array)
-                                       end),
+                                       end,
+                                       env_name: "FL_POD_PUSH_SOURCES"),
           FastlaneCore::ConfigItem.new(key: :swift_version,
                                        description: "The SWIFT_VERSION that should be used to lint the spec. This takes precedence over a .swift-version file",
                                        optional: true,
-                                       is_string: true),
+                                       is_string: true,
+                                       env_name: "FL_POD_PUSH_SWIFT_VERSION"),
           FastlaneCore::ConfigItem.new(key: :skip_import_validation,
                                        description: "Lint skips validating that the pod can be imported",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_SKIP_IMPORT_VALIDATION"),
           FastlaneCore::ConfigItem.new(key: :skip_tests,
                                        description: "Lint skips building and running tests during validation",
                                        optional: true,
-                                       type: Boolean),
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_SKIP_TESTS"),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        description: "Show more debugging information",
                                        optional: true,
                                        type: Boolean,
-                                       default_value: false)
+                                       default_value: false,
+                                       env_name: "FL_POD_PUSH_VERBOSE")
         ]
       end
 

data/fastlane/lib/fastlane/actions/puts.rb

@@ -9,7 +9,7 @@ module Fastlane
           return
         end
 
-        # no paramter included in the call means treat this like a normal fastlane ruby call
+        # no parameter included in the call means treat this like a normal fastlane ruby call
         UI.message(params.join(' '))
       end
 

data/fastlane/lib/fastlane/actions/sonar.rb

@@ -21,6 +21,9 @@ module Fastlane
         sonar_scanner_args << "-Dsonar.login=\"#{params[:sonar_login]}\"" if params[:sonar_login]
         sonar_scanner_args << "-Dsonar.host.url=\"#{params[:sonar_url]}\"" if params[:sonar_url]
         sonar_scanner_args << "-Dsonar.branch.name=\"#{params[:branch_name]}\"" if params[:branch_name]
+        sonar_scanner_args << "-Dsonar.pullrequest.branch=\"#{params[:pull_request_branch]}\"" if params[:pull_request_branch]
+        sonar_scanner_args << "-Dsonar.pullrequest.base=\"#{params[:pull_request_base]}\"" if params[:pull_request_base]
+        sonar_scanner_args << "-Dsonar.pullrequest.key=\"#{params[:pull_request_key]}\"" if params[:pull_request_key]
         sonar_scanner_args << params[:sonar_runner_args] if params[:sonar_runner_args]
 
         command = [
@@ -103,6 +106,21 @@ module Fastlane
                                        env_name: "FL_SONAR_RUNNER_BRANCH_NAME",
                                        description: "Pass the branch name which is getting scanned",
                                        optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_branch,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_BRANCH",
+                                       description: "The name of the branch that contains the changes to be merged",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_base,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_BASE",
+                                       description: "The long-lived branch into which the PR will be merged",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :pull_request_key,
+                                       env_name: "FL_SONAR_RUNNER_PULL_REQUEST_KEY",
+                                       description: "Unique identifier of your PR. Must correspond to the key of the PR in GitHub or TFS",
+                                       optional: true,
                                        is_string: true)
         ]
       end

data/fastlane/lib/fastlane/commands_generator.rb

@@ -43,7 +43,7 @@ module Fastlane
       Fastlane::PluginUpdateManager.show_update_status
       if FastlaneCore::Globals.capture_output?
         if $stdout.respond_to?(:string)
-          # Sometimes you can get NoMethodError: undefined method `string' for #<IO:<STDOUT>> when runing with FastlaneRunner (swift)
+          # Sometimes you can get NoMethodError: undefined method `string' for #<IO:<STDOUT>> when running with FastlaneRunner (swift)
           FastlaneCore::Globals.captured_output = Helper.strip_ansi_colors($stdout.string)
         end
         $stdout = STDOUT

data/fastlane/lib/fastlane/helper/adb_helper.rb

@@ -31,6 +31,11 @@ module Fastlane
       end
 
       def device_avalaible?(serial)
+        UI.deprecated("Please use `device_available?` instead... This will be removed in a future version of fastlane")
+        device_available?(serial)
+      end
+
+      def device_available?(serial)
         load_all_devices
         return devices.map(&:serial).include?(serial)
       end

data/fastlane/lib/fastlane/helper/crashlytics_helper.rb

@@ -7,7 +7,7 @@ module Fastlane
         def discover_crashlytics_path(params)
           path = params[:crashlytics_path]
 
-          # Finding submit binary inside of given Crashlytics path (for backwards compatability)
+          # Finding submit binary inside of given Crashlytics path (for backwards compatibility)
           if path
             if File.basename(path) != "submit"
               path = Dir[File.join(path, '**', 'submit')].last

data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb

@@ -337,6 +337,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
       key_default_values = []
       key_optionality_values = []
       key_type_overrides = []
+      key_is_strings = []
 
       if options.kind_of?(Array)
         options.each do |current|
@@ -350,6 +351,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
           key_default_values << current.code_gen_default_value
           key_optionality_values << current.optional
           key_type_overrides << current.data_type
+          key_is_strings << current.is_string
         end
       end
       action_return_type = action.return_type
@@ -362,6 +364,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
           key_default_values: key_default_values,
           key_optionality_values: key_optionality_values,
           key_type_overrides: key_type_overrides,
+          key_is_strings: key_is_strings,
           return_type: action_return_type
         )
         generated_protocol_file_path = generate_tool_protocol(tool_swift_function: tool_swift_function)
@@ -375,6 +378,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
           key_default_values: key_default_values,
           key_optionality_values: key_optionality_values,
           key_type_overrides: key_type_overrides,
+          key_is_strings: key_is_strings,
           return_type: action_return_type
         )
       end

data/fastlane/lib/fastlane/swift_fastlane_function.rb

@@ -7,15 +7,17 @@ module Fastlane
     attr_accessor :param_default_values
     attr_accessor :param_optionality_values
     attr_accessor :param_type_overrides
+    attr_accessor :param_is_strings
     attr_accessor :reserved_words
     attr_accessor :default_values_to_ignore
 
-    def initialize(action_name: nil, keys: nil, key_descriptions: nil, key_default_values: nil, key_optionality_values: nil, key_type_overrides: nil, return_type: nil)
+    def initialize(action_name: nil, keys: nil, key_descriptions: nil, key_default_values: nil, key_optionality_values: nil, key_type_overrides: nil, key_is_strings: nil, return_type: nil)
       @function_name = action_name
       @param_names = keys
       @param_descriptions = key_descriptions
       @param_default_values = key_default_values
       @param_optionality_values = key_optionality_values
+      @param_is_strings = key_is_strings
       @return_type = return_type
       @param_type_overrides = key_type_overrides
 
@@ -91,11 +93,13 @@ module Fastlane
       return default_value
     end
 
-    def get_type(param: nil, default_value: nil, optional: nil, param_type_override: nil)
+    def get_type(param: nil, default_value: nil, optional: nil, param_type_override: nil, is_string: true)
       unless param_type_override.nil?
         type = determine_type_from_override(type_override: param_type_override)
       end
-      type ||= "String"
+
+      # defaulting type to Any if is_string is false so users are allowed to input all allowed types
+      type ||= is_string ? "String" : "Any"
 
       optional_specifier = ""
       # if we are optional and don't have a default value, we'll need to use ?
@@ -121,8 +125,8 @@ module Fastlane
         return ""
       end
 
-      param_names_and_types = @param_names.zip(param_default_values, param_optionality_values, param_type_overrides).map do |param, default_value, optional, param_type_override|
-        type = get_type(param: param, default_value: default_value, optional: optional, param_type_override: param_type_override)
+      param_names_and_types = @param_names.zip(param_default_values, param_optionality_values, param_type_overrides, param_is_strings).map do |param, default_value, optional, param_type_override, is_string|
+        type = get_type(param: param, default_value: default_value, optional: optional, param_type_override: param_type_override, is_string: is_string)
 
         unless default_value.nil?
           if type == "[String : Any]"
@@ -304,8 +308,8 @@ module Fastlane
         return ""
       end
 
-      param_names_and_types = @param_names.zip(param_default_values, param_optionality_values, param_type_overrides).map do |param, default_value, optional, param_type_override|
-        type = get_type(param: param, default_value: default_value, optional: optional, param_type_override: param_type_override)
+      param_names_and_types = @param_names.zip(param_default_values, param_optionality_values, param_type_overrides).map do |param, default_value, optional, param_type_override, is_string|
+        type = get_type(param: param, default_value: default_value, optional: optional, param_type_override: param_type_override, is_string: is_string)
 
         param = camel_case_lower(string: param)
         param = sanitize_reserved_word(word: param)

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.129.0.beta.20190811200106'.freeze
+  VERSION = '2.129.0.beta.20190813200016'.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/analytics/analytics_event_builder.rb

@@ -13,7 +13,7 @@ module FastlaneCore
     def new_event(action_stage)
       {
         client_id: @p_hash,
-        category: "fastlane Client Langauge - #{@fastlane_client_language}",
+        category: "fastlane Client Language - #{@fastlane_client_language}",
         action: action_stage,
         label: action_name,
         value: nil

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -196,7 +196,7 @@ module FastlaneCore
         return
       end
 
-      # We need to explicity test against Fastlane::Boolean, TrueClass/FalseClass
+      # We need to explicitly test against Fastlane::Boolean, TrueClass/FalseClass
       if value.class != FalseClass && value.class != TrueClass
         UI.user_error!("'#{self.key}' value must be either `true` or `false`! Found #{value.class} instead.")
       end

data/frameit/lib/frameit/editor.rb

@@ -330,7 +330,7 @@ module Frameit
         background = put_title_into_background_stacked(background, title, keyword)
         return background
       end
-      # sum_width: the width of both labels together including the space inbetween
+      # sum_width: the width of both labels together including the space in-between
       #   is used to calculate the ratio
       sum_width = title.width
       sum_width += keyword.width + keyword_padding if keyword

data/gym/lib/gym/options.rb

@@ -210,7 +210,7 @@ module Gym
                                      env_name: "SUPPRESS_OUTPUT",
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
-                                     is_string: false),
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
                                      env_name: "DISABLE_XCPRETTY",
                                      description: "Disable xcpretty formatting of build output",

data/match/lib/match/nuke.rb

@@ -148,7 +148,7 @@ module Match
         rows = self.profiles.collect do |p|
           status = p.status == 'Active' ? p.status.green : p.status.red
 
-          # Expires is somtimes nil
+          # Expires is sometimes nil
           expires = p.expires ? p.expires.strftime("%Y-%m-%d") : nil
           [p.name, p.id, status, p.type, expires]
         end

data/match/lib/match/runner.rb

@@ -156,7 +156,7 @@ module Match
           UI.message("Installing certificate...")
 
           # Only looking for cert in "custom" (non login.keychain) keychain
-          # Doing this for backwards compatability
+          # Doing this for backwards compatibility
           keychain_name = params[:keychain_name] == "login.keychain" ? nil : params[:keychain_name]
 
           if FastlaneCore::CertChecker.installed?(cert_path, in_keychain: keychain_name)
@@ -217,7 +217,7 @@ module Match
         end
       end
 
-      if profile.nil? || params[:force]
+      if profile.nil? || force
         if params[:readonly]
           UI.error("No matching provisioning profiles found for '#{profile_name}'")
           UI.error("A new one cannot be created because you enabled `readonly`")

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

@@ -23,7 +23,7 @@ module Match
 
       # Call this method after creating a new object to configure
       # the given Storage object. This method will take
-      # different paramters depending on specific class being used
+      # different parameters depending on specific class being used
       def configure
         not_implemented(__method__)
       end

data/scan/lib/scan/options.rb

@@ -213,7 +213,7 @@ module Scan
                                      env_name: "SCAN_SUPPRESS_XCODE_OUTPUT",
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
-                                     is_string: false),
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :formatter,
                                      short_option: "-n",
                                      env_name: "SCAN_FORMATTER",

data/scan/lib/scan/runner.rb

@@ -136,7 +136,7 @@ module Scan
       # Zips build products and moves it to output directory
       UI.message("Zipping build products")
       FastlaneCore::Helper.zip_directory(path, output_path, contents_only: true, overwrite: true, print: false)
-      UI.message("Succesfully zipped build products: #{output_path}")
+      UI.message("Successfully zipped build products: #{output_path}")
     end
 
     def test_results

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

@@ -24,6 +24,7 @@ module Spaceship
 
       module BetaTesterState
         INSTALLED = "INSTALLED"
+        INVITED = "INVITED"
         NO_BUILDS = "NO_BUILDS"
       end
 

data/spaceship/lib/spaceship/du/du_client.rb

@@ -22,6 +22,10 @@ module Spaceship
       upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: screenshot_picture_type(device, is_messages))
     end
 
+    def upload_purchase_merch_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
+      upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.MerchandisingIAPIcon')
+    end
+
     def upload_purchase_review_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
       upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: get_picture_type(upload_file))
     end

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -89,6 +89,12 @@ module Spaceship
       # Certs are not associated with apps
       #####################################################
 
+      # An Apple development code signing certificate used for development environment
+      class AppleDevelopment < Certificate; end
+
+      # An Apple distribution code signing certificate used for distribution environment
+      class AppleDistribution < Certificate; end
+
       # A development code signing certificate used for development environment
       class Development < Certificate; end
 
@@ -152,6 +158,11 @@ module Spaceship
       # A Mac push notification certificate for production environment
       class MacProductionPush < PushCertificate; end
 
+      APPLE_CERTIFICATE_TYPE_IDS = {
+        "83Q87W3TGH" => AppleDevelopment,
+        "WXV89964HE" => AppleDistribution
+      }
+
       IOS_CERTIFICATE_TYPE_IDS = {
         "5QPB9NHCEI" => Development,
         "R58UK2EWSO" => Production,
@@ -187,7 +198,9 @@ module Spaceship
         "DIVN2GW3XT" => DeveloperIdApplication
       }
 
-      CERTIFICATE_TYPE_IDS = IOS_CERTIFICATE_TYPE_IDS.merge(MAC_CERTIFICATE_TYPE_IDS)
+      CERTIFICATE_TYPE_IDS = APPLE_CERTIFICATE_TYPE_IDS
+                             .merge(IOS_CERTIFICATE_TYPE_IDS)
+                             .merge(MAC_CERTIFICATE_TYPE_IDS)
 
       # Class methods
       class << self
@@ -259,6 +272,7 @@ module Spaceship
         def all(mac: false)
           if self == Certificate # are we the base-class?
             type_ids = mac ? MAC_CERTIFICATE_TYPE_IDS : IOS_CERTIFICATE_TYPE_IDS
+            type_ids = APPLE_CERTIFICATE_TYPE_IDS.merge(type_ids)
             types = type_ids.keys
             types += OLDER_IOS_CERTIFICATE_TYPES unless mac
           else

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -25,7 +25,7 @@ module Spaceship
         puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
         puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
         puts("")
-        puts("Execption type: #{ex.class}")
+        puts("Exception type: #{ex.class}")
         raise ex
       end
 

data/spaceship/lib/spaceship/test_flight/tester.rb

@@ -93,7 +93,7 @@ module Spaceship
       end
 
       # @return (Spaceship::TestFlight::Tester) Returns the testers matching the parameter.
-      # ITC searchs all fields, and is full text. The search results are the union of all words in the search text
+      # ITC searches all fields, and is full text. The search results are the union of all words in the search text
       # @param text (String) (required): Value used to filter the tester, case insensitive
       def self.search(app_id: nil, text: nil, is_email_exact_match: false)
         text = text.strip

data/spaceship/lib/spaceship/tunes/display_family.rb

@@ -5,7 +5,7 @@ module Spaceship
     # A definition of different styled displays used by devices
     # that App Store Connect supports storing screenshots.
     # Display styles often only vary based on screen resolution
-    # however other aspects of a displays physical apperance are
+    # however other aspects of a displays physical appearance are
     # also factored (i.e if the home indicator is provided via
     # a hardware button or a software interface).
     class DisplayFamily
@@ -15,12 +15,12 @@ module Spaceship
       # Spaceship::Tunes::AppScreenshot#device_type attribute.
       attr_accessor :name
 
-      # The user friendly name of this defintion.
+      # The user friendly name of this definition.
       #
       # Source: Media Manager in App Store Connect.
       attr_accessor :friendly_name
 
-      # The user friendly category for this defintion (i.e iPhone,
+      # The user friendly category for this definition (i.e iPhone,
       # Apple TV or Desktop).
       attr_accessor :friendly_category_name
 

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -65,6 +65,7 @@ module Spaceship
                   reference_name: nil,
                   product_id: nil,
                   cleared_for_sale: true,
+                  merch_screenshot: nil,
                   review_notes: nil,
                   review_screenshot: nil,
                   pricing_intervals: nil,
@@ -78,6 +79,7 @@ module Spaceship
                            reference_name: reference_name,
                            product_id: product_id,
                            cleared_for_sale: cleared_for_sale,
+                           merch_screenshot: merch_screenshot,
                            review_notes: review_notes,
                            review_screenshot: review_screenshot,
                            pricing_intervals: pricing_intervals,

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -30,6 +30,10 @@ module Spaceship
       # @return (Bool) Cleared for sale flag
       attr_accessor :cleared_for_sale
 
+      # @return (Hash) app store promotion image (optional)
+      attr_accessor :merch_screenshot
+
+      # @return (Hash) app review screenshot (required)
       attr_accessor :review_screenshot
 
       # @return (String) the notes for the review team
@@ -142,6 +146,12 @@ module Spaceship
         Tunes::IAPStatus.get_from_string(raw_data["versions"].first["status"])
       end
 
+      # @return (Hash) Hash containing existing promotional image data
+      def merch_screenshot
+        return nil unless raw_data && raw_data["versions"] && raw_data["versions"].first && raw_data["versions"].first["merch"] && raw_data["versions"].first["merch"]["images"].first["image"]["value"]
+        raw_data["versions"].first["merch"]["images"].first["image"]["value"]
+      end
+
       # @return (Hash) Hash containing existing review screenshot data
       def review_screenshot
         return nil unless raw_data && raw_data["versions"] && raw_data["versions"].first && raw_data["versions"].first["reviewScreenshot"] && raw_data['versions'].first["reviewScreenshot"]["value"]
@@ -172,6 +182,13 @@ module Spaceship
         raw_data.set(["pricingIntervals"], raw_pricing_intervals)
         @raw_pricing_data["subscriptions"] = raw_pricing_intervals if @raw_pricing_data
 
+        if @merch_screenshot
+          # Upload App Store Promotional image (Optional)
+          upload_file = UploadFile.from_path(@merch_screenshot)
+          merch_data = client.upload_purchase_merch_screenshot(application.apple_id, upload_file)
+          raw_data["versions"][0]["merch"] = merch_data
+        end
+
         if @review_screenshot
           # Upload Screenshot
           upload_file = UploadFile.from_path(@review_screenshot)

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -791,6 +791,35 @@ module Spaceship
       du_client.upload_watch_icon(app_version, upload_image, content_provider_id, sso_token_for_image)
     end
 
+    # Uploads an In-App-Purchase Promotional image
+    # @param upload_image (UploadFile): The icon to upload
+    # @return [JSON] the image data, ready to be added to an In-App-Purchase
+    def upload_purchase_merch_screenshot(app_id, upload_image)
+      data = du_client.upload_purchase_merch_screenshot(app_id, upload_image, content_provider_id, sso_token_for_image)
+      {
+        "images" => [
+          {
+            "id" => nil,
+            "image" => {
+              "value" => {
+                "assetToken" => data["token"],
+                "originalFileName" => upload_image.file_name,
+                "height" => data["height"],
+                "width" => data["width"],
+                "checksum" => data["md5"]
+              },
+              "isEditable" => true,
+              "isREquired" => false,
+              "errorKeys" => nil
+            },
+            "status" => "proposed"
+          }
+        ],
+        "showByDefault" => true,
+        "isActive" => false
+      }
+    end
+
     # Uploads an In-App-Purchase Review screenshot
     # @param app_id (AppId): The id of the app
     # @param upload_image (UploadFile): The icon to upload
@@ -1304,7 +1333,7 @@ module Spaceship
     end
 
     # Creates an In-App-Purchases
-    def create_iap!(app_id: nil, type: nil, versions: nil, reference_name: nil, product_id: nil, cleared_for_sale: true, review_notes: nil, review_screenshot: nil, pricing_intervals: nil, family_id: nil, subscription_duration: nil, subscription_free_trial: nil)
+    def create_iap!(app_id: nil, type: nil, versions: nil, reference_name: nil, product_id: nil, cleared_for_sale: true, merch_screenshot: nil, review_notes: nil, review_screenshot: nil, pricing_intervals: nil, family_id: nil, subscription_duration: nil, subscription_free_trial: nil)
       # Load IAP Template based on Type
       type ||= "consumable"
       r = request(:get, "ra/apps/#{app_id}/iaps/#{type}/template")
@@ -1348,6 +1377,13 @@ module Spaceship
       data["versions"][0]["details"]["value"] = versions_array
       data['versions'][0]["reviewNotes"] = { value: review_notes }
 
+      if merch_screenshot
+        # Upload App Store Promotional image (Optional)
+        upload_file = UploadFile.from_path(merch_screenshot)
+        merch_data = upload_purchase_merch_screenshot(app_id, upload_file)
+        data["versions"][0]["merch"] = merch_data
+      end
+
       if review_screenshot
         # Upload Screenshot:
         upload_file = UploadFile.from_path(review_screenshot)

data/supply/lib/supply/client.rb

@@ -312,7 +312,7 @@ module Supply
 
       track_version_codes = apk_version_code.kind_of?(Array) ? apk_version_code : [apk_version_code]
 
-      # This change happend on 2018-04-24
+      # This change happened on 2018-04-24
       # rollout cannot be sent on any other track besides "rollout"
       # https://github.com/fastlane/fastlane/issues/12372
       rollout = nil unless track == "rollout"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.129.0.beta.20190811200106
+  version: 2.129.0.beta.20190813200016
 platform: ruby
 authors:
 - Luka Mirosevic
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1742,24 +1742,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- sigh/lib
+- scan/lib
+- deliver/lib
 - produce/lib
+- spaceship/lib
+- pem/lib
+- match/lib
+- screengrab/lib
 - frameit/lib
+- credentials_manager/lib
+- pilot/lib
 - fastlane/lib
-- spaceship/lib
-- fastlane_core/lib
+- cert/lib
 - supply/lib
-- gym/lib
-- screengrab/lib
 - precheck/lib
-- pem/lib
-- scan/lib
-- credentials_manager/lib
-- match/lib
 - snapshot/lib
-- cert/lib
-- deliver/lib
-- pilot/lib
+- gym/lib
+- sigh/lib
+- fastlane_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="