fastlane 2.151.2 → 2.155.0

data/deliver/lib/deliver/submit_for_review.rb

@@ -7,9 +7,7 @@ require 'fastlane_core/pkg_file_analyser'
 module Deliver
   class SubmitForReview
     def submit!(options)
-      legacy_app = options[:app]
-      app_id = legacy_app.apple_id
-      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+      app = options[:app]
 
       platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
       version = app.get_edit_app_store_version(platform: platform)
@@ -120,10 +118,10 @@ module Deliver
           "  Example: submission_information: { add_id_info_uses_idfa: false }",
           "  Example: submission_information: {",
           "    add_id_info_uses_idfa: true,",
-          "    add_id_info_limits_tracking: false,",
           "    add_id_info_serves_ads: false,",
-          "    add_id_info_uses_idfa: false,",
-          "    add_id_info_tracks_install: false",
+          "    add_id_info_tracks_install: true,",
+          "    add_id_info_tracks_action: true,",
+          "    add_id_info_limits_tracking: true",
           "  }",
           "  Example CLI:",
           "    --submission_information \"{\\\"add_id_info_uses_idfa\\\": false}\""

data/deliver/lib/deliver/upload_metadata.rb

@@ -8,10 +8,10 @@ module Deliver
     LOCALISED_VERSION_VALUES = {
       description: "description",
       keywords: "keywords",
-      release_notes: "whatsNew",
-      support_url: "supportUrl",
-      marketing_url: "marketingUrl",
-      promotional_text: "promotionalText"
+      release_notes: "whats_new",
+      support_url: "support_url",
+      marketing_url: "marketing_url",
+      promotional_text: "promotional_text"
     }
 
     # Everything attached to the version but not being localised
@@ -23,14 +23,19 @@ module Deliver
     LOCALISED_APP_VALUES = {
       name: "name",
       subtitle: "subtitle",
-      privacy_url: "privacyPolicyUrl",
-      apple_tv_privacy_policy: "privacyPolicyText"
+      privacy_url: "privacy_policy_url",
+      apple_tv_privacy_policy: "privacy_policy_text"
     }
 
     # Non localized app details values
-    NON_LOCALISED_APP_VALUES = [:primary_category, :secondary_category,
-                                :primary_first_sub_category, :primary_second_sub_category,
-                                :secondary_first_sub_category, :secondary_second_sub_category]
+    NON_LOCALISED_APP_VALUES = {
+      primary_category: :primary_category,
+      secondary_category: :secondary_category,
+      primary_first_sub_category: :primary_subcategory_one,
+      primary_second_sub_category: :primary_subcategory_two,
+      secondary_first_sub_category: :secondary_subcategory_one,
+      secondary_second_sub_category: :secondary_subcategory_two
+    }
 
     # Review information values
     REVIEW_INFORMATION_VALUES_LEGACY = {
@@ -43,12 +48,12 @@ module Deliver
       review_notes: :notes
     }
     REVIEW_INFORMATION_VALUES = {
-      first_name: "contactFirstName",
-      last_name: "contactLastName",
-      phone_number: "contactPhone",
-      email_address: "contactEmail",
-      demo_user: "demoAccountName",
-      demo_password: "demoAccountPassword",
+      first_name: "contact_first_name",
+      last_name: "contact_last_name",
+      phone_number: "contact_phone",
+      email_address: "contact_email",
+      demo_user: "demo_account_name",
+      demo_password: "demo_account_password",
       notes: "notes"
     }
 
@@ -74,9 +79,7 @@ module Deliver
     def upload(options)
       return if options[:skip_metadata]
 
-      legacy_app = options[:app]
-      app_id = legacy_app.apple_id
-      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+      app = options[:app]
 
       platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
 
@@ -175,6 +178,11 @@ module Deliver
                      end
       non_localized_version_attributes['releaseType'] = release_type
 
+      # Update app store version
+      # This needs to happen before updating localizations (https://openradar.appspot.com/radar?id=4925914991296512)
+      UI.message("Uploading metadata to App Store Connect for version")
+      version.update(attributes: non_localized_version_attributes)
+
       # Update app store version localizations
       app_store_version_localizations.each do |app_store_version_localization|
         attributes = localized_version_attributes_by_locale[app_store_version_localization.locale]
@@ -193,10 +201,6 @@ module Deliver
         end
       end
 
-      # Update app store version
-      UI.message("Uploading metadata to App Store Connect for version")
-      version.update(attributes: non_localized_version_attributes)
-
       # Update categories
       app_info = app.fetch_edit_app_info
       if app_info
@@ -494,7 +498,7 @@ module Deliver
       end
 
       # Load non localised data
-      (NON_LOCALISED_VERSION_VALUES.keys + NON_LOCALISED_APP_VALUES).each do |key|
+      (NON_LOCALISED_VERSION_VALUES.keys + NON_LOCALISED_APP_VALUES.keys).each do |key|
         path = File.join(options[:metadata_path], "#{key}.txt")
         next unless File.exist?(path)
 
@@ -503,13 +507,30 @@ module Deliver
       end
 
       # Load review information
-      options[:app_review_information] ||= {}
-      REVIEW_INFORMATION_VALUES.keys.each do |option_name|
+      # This is used to find the file path for both new and legacy review information filenames
+      resolve_review_info_path = lambda do |option_name|
         path = File.join(options[:metadata_path], REVIEW_INFORMATION_DIR, "#{option_name}.txt")
-        next unless File.exist?(path)
-        next if options[:app_review_information][option_name].to_s.length > 0
+        return nil unless File.exist?(path)
+        return nil if options[:app_review_information][option_name].to_s.length > 0
 
         UI.message("Loading '#{path}'...")
+        return path
+      end
+
+      # First try and load review information from legacy filenames
+      options[:app_review_information] ||= {}
+      REVIEW_INFORMATION_VALUES_LEGACY.each do |legacy_option_name, option_name|
+        path = resolve_review_info_path.call(legacy_option_name)
+        next if path.nil?
+        options[:app_review_information][option_name] ||= File.read(path)
+
+        UI.deprecated("Review rating option '#{legacy_option_name}' from iTunesConnect has been deprecated. Please replace with '#{option_name}'")
+      end
+
+      # Then load review information from new App Store Connect filenames
+      REVIEW_INFORMATION_VALUES.keys.each do |option_name|
+        path = resolve_review_info_path.call(option_name)
+        next if path.nil?
         options[:app_review_information][option_name] ||= File.read(path)
       end
     end
@@ -541,10 +562,10 @@ module Deliver
         attributes[attribute_name] = strip_value unless strip_value.empty?
       end
 
-      if !attributes["demoAccountName"].to_s.empty? && !attributes["demoAccountPassword"].to_s.empty?
-        attributes["demoAccountRequired"] = true
+      if !attributes["demo_account_name"].to_s.empty? && !attributes["demo_account_password"].to_s.empty?
+        attributes["demo_account_required"] = true
       else
-        attributes["demoAccountRequired"] = false
+        attributes["demo_account_required"] = false
       end
 
       UI.message("Uploading app review information to App Store Connect")

data/deliver/lib/deliver/upload_price_tier.rb

@@ -9,9 +9,7 @@ module Deliver
 
       price_tier = options[:price_tier].to_s
 
-      legacy_app = options[:app]
-      app_id = legacy_app.apple_id
-      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+      app = options[:app]
 
       attributes = {}
       territory_ids = []

data/deliver/lib/deliver/upload_screenshots.rb

@@ -12,9 +12,7 @@ module Deliver
       return if options[:skip_screenshots]
       return if options[:edit_live]
 
-      legacy_app = options[:app]
-      app_id = legacy_app.apple_id
-      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+      app = options[:app]
 
       platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
       version = app.get_edit_app_store_version(platform: platform)
@@ -28,47 +26,7 @@ module Deliver
       localizations = version.get_app_store_version_localizations
 
       if options[:overwrite_screenshots]
-        # Get localizations on version
-        localizations.each do |localization|
-          # Only delete screenshots if trying to upload
-          next unless screenshots_per_language.keys.include?(localization.locale)
-
-          # Iterate over all screenshots for each set and delete
-          screenshot_sets = localization.get_app_screenshot_sets
-
-          # Multi threading delete on single localization
-          threads = []
-          errors = []
-
-          screenshot_sets.each do |screenshot_set|
-            UI.message("Removing all previously uploaded screenshots for '#{localization.locale}' '#{screenshot_set.screenshot_display_type}'...")
-            screenshot_set.app_screenshots.each do |screenshot|
-              UI.verbose("Deleting screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
-              threads << Thread.new do
-                begin
-                  screenshot.delete!
-                  UI.verbose("Deleted screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
-                rescue => error
-                  UI.verbose("Failed to delete screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
-                  errors << error
-                end
-              end
-            end
-          end
-
-          sleep(1) # Feels bad but sleeping a bit to let the threads catchup
-
-          unless threads.empty?
-            Helper.show_loading_indicator("Waiting for screenshots to be deleted for '#{localization.locale}'... (might be slow)") unless FastlaneCore::Globals.verbose?
-            threads.each(&:join)
-            Helper.hide_loading_indicator unless FastlaneCore::Globals.verbose?
-          end
-
-          # Crash if any errors happen while deleting
-          errors.each do |error|
-            UI.error(error.message)
-          end
-        end
+        delete_screenshots(localizations, screenshots_per_language)
       end
 
       # Finding languages to enable
@@ -95,6 +53,79 @@ module Deliver
       upload_screenshots(screenshots_per_language, localizations, options)
     end
 
+    def delete_screenshots(localizations, screenshots_per_language, tries: 5)
+      tries -= 1
+
+      # Get localizations on version
+      localizations.each do |localization|
+        # Only delete screenshots if trying to upload
+        next unless screenshots_per_language.keys.include?(localization.locale)
+
+        # Iterate over all screenshots for each set and delete
+        screenshot_sets = localization.get_app_screenshot_sets
+
+        # Multi threading delete on single localization
+        threads = []
+        errors = []
+
+        screenshot_sets.each do |screenshot_set|
+          UI.message("Removing all previously uploaded screenshots for '#{localization.locale}' '#{screenshot_set.screenshot_display_type}'...")
+          screenshot_set.app_screenshots.each do |screenshot|
+            UI.verbose("Deleting screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+            threads << Thread.new do
+              begin
+                screenshot.delete!
+                UI.verbose("Deleted screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+              rescue => error
+                UI.verbose("Failed to delete screenshot - #{localization.locale} #{screenshot_set.screenshot_display_type} #{screenshot.id}")
+                errors << error
+              end
+            end
+          end
+        end
+
+        sleep(1) # Feels bad but sleeping a bit to let the threads catchup
+
+        unless threads.empty?
+          Helper.show_loading_indicator("Waiting for screenshots to be deleted for '#{localization.locale}'... (might be slow)") unless FastlaneCore::Globals.verbose?
+          threads.each(&:join)
+          Helper.hide_loading_indicator unless FastlaneCore::Globals.verbose?
+        end
+
+        # Crash if any errors happen while deleting
+        errors.each do |error|
+          UI.error(error.message)
+        end
+      end
+
+      # Verify all screenshots have been deleted
+      # Sometimes API requests will fail but screenshots will still be deleted
+      count = count_screenshots(localizations)
+      UI.important("Number of screenshots not deleted: #{count}")
+      if count > 0
+        if tries.zero?
+          UI.user_error!("Failed verification of all screenshots deleted... #{count} screenshot(s) still exist")
+        else
+          UI.error("Failed to delete all screenshots... Tries remaining: #{tries}")
+          delete_screenshots(localizations, screenshots_per_language, tries: tries)
+        end
+      else
+        UI.message("Successfully deleted all screenshots")
+      end
+    end
+
+    def count_screenshots(localizations)
+      count = 0
+      localizations.each do |localization|
+        screenshot_sets = localization.get_app_screenshot_sets
+        screenshot_sets.each do |screenshot_set|
+          count += screenshot_set.app_screenshots.size
+        end
+      end
+
+      return count
+    end
+
     def upload_screenshots(screenshots_per_language, localizations, options)
       # Check if should wait for processing
       # Default to waiting if submitting for review (since needed for submission)

data/fastlane/lib/fastlane/actions/carthage.rb

@@ -20,6 +20,7 @@ module Fastlane
         cmd << "--output #{params[:output]}" if params[:output]
         cmd << "--use-ssh" if params[:use_ssh]
         cmd << "--use-submodules" if params[:use_submodules]
+        cmd << "--use-netrc" if params[:use_netrc]
         cmd << "--no-use-binaries" if params[:use_binaries] == false
         cmd << "--no-checkout" if params[:no_checkout] == true
         cmd << "--no-build" if params[:no_build] == true
@@ -89,6 +90,12 @@ module Fastlane
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :use_netrc,
+                                       env_name: "FL_CARTHAGE_USE_NETRC",
+                                       description: "Use .netrc for downloading frameworks",
+                                       is_string: false,
+                                       type: Boolean,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :use_binaries,
                                        env_name: "FL_CARTHAGE_USE_BINARIES",
                                        description: "Check out dependency repositories even when prebuilt frameworks exist",

data/fastlane/lib/fastlane/actions/create_keychain.rb

@@ -4,6 +4,7 @@ module Fastlane
   module Actions
     module SharedValues
       ORIGINAL_DEFAULT_KEYCHAIN = :ORIGINAL_DEFAULT_KEYCHAIN
+      KEYCHAIN_PATH = :KEYCHAIN_PATH
     end
 
     class CreateKeychainAction < Action
@@ -32,6 +33,8 @@ module Fastlane
           UI.important("If creating a new Keychain DB is required please set the `require_create` option true to cause the action to fail")
         end
 
+        Actions.lane_context[Actions::SharedValues::KEYCHAIN_PATH] = keychain_path
+
         if params[:default_keychain]
           # if there is no default keychain - setting the original will fail - silent this error
           begin
@@ -91,7 +94,8 @@ module Fastlane
 
       def self.output
         [
-          ['ORIGINAL_DEFAULT_KEYCHAIN', 'The path to the default keychain']
+          ['ORIGINAL_DEFAULT_KEYCHAIN', 'The path to the default keychain'],
+          ['KEYCHAIN_PATH', 'The path of the keychain']
         ]
       end
 

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

@@ -135,7 +135,7 @@ The general parameters are defined in the `default` key and can be:
 | `show_complete_frame` | Specifies whether _frameit_ should shrink the device frame so that it is completely shown in the framed screenshot. If it is false, clipping of the device frame might occur at the bottom (when `title_below_image` is `false`) or top (when `title_below_image` is `true`) of the framed screenshot. | `false` |
 | `padding` | The content of the framed screenshot will be resized to match the specified `padding` around all edges. The vertical padding is also applied between the text and the top or bottom (depending on `title_below_image`) of the device frame. <p> There are 3 different options of specyfying the padding: <p> 1. Default: An integer value that defines both horizontal and vertical padding in pixels. <br> 2. A string that defines (different) padding values in pixels for horizontal and vertical padding. The syntax is `"<horizontal>x<vertical>"`, e.g. `"30x60"`. <br> 3. A string that defines (different) padding values in percentage for horizontal and vertical padding. The syntax is `"<horizontal>%x<vertical>%"`, e.g. `"5%x10%"`. <br> **Note:** The percentage is calculated from the smallest image dimension (height or width). <p> A combination of option 2 and 3 is possible, e.g. `"5%x40"`. | `50` |
 | `interline_spacing` | Specifies whether _frameit_ should add or subtract this many pixels between the individual lines of text. This only applies to a multi-line `title` and/or `keyword` to expand or squash together the individual lines of text. | `0` |
-| `font_scale_factor` | Specifies whether _frameit_ should increase or decrease the font size of the text. | `0.1` |
+| `font_scale_factor` | Specifies whether _frameit_ should increase or decrease the font size of the text. Is ignored for `keyword` or `title`, if `font_size` is specified. | `0.1` |
 | `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK`, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
 | `title_min_height` | Specifies a height always reserved for the title. Value can be a percentage of the height or an absolute value. The device will be placed below (or above) this area. Convenient to ensure the device top (or bottom) will be consistently placed at the same height on the different screenshots. | NA |
 | `use_platform` | Overrides the platform used for the screenshot. Valid values are `IOS`, `ANDROID` and `ANY`. | `IOS` |
@@ -163,6 +163,7 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
 |-----|-------------|---------------|
 | `color` | The font color for the text. Specify a hex/html color code. | `#000000` (black) |
 | `font` | The font family for the text. Specify the (relative) path to the font file (e.g. an OpenType Font). | The default `imagemagick` font, which is system dependent. |
+| `font_size` | The font size for the text specified in points. If not specified or `0`, font will be scaled automatically to fit the available space. _frameit_ still shrinks the text, if it would not fit. | NA |
 | `text` | The text that should be used for the `keyword` or `title`. <p> Note: If you want to use localised text, use [`.strings` files](#strings-files). | NA |
 
 ### Example
@@ -176,6 +177,7 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
     },
     "title": {
       "font": "./fonts/MyFont-Th.otf",
+      "font_size": 128,
       "color": "#545454"
     },
     "background": "./background.jpg",

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

@@ -111,6 +111,25 @@ match
 
 You can find more information about GitHub basic authentication and personal token generation here: [https://developer.github.com/v3/auth/#basic-authentication](https://developer.github.com/v3/auth/#basic-authentication)
 
+##### Git Storage on GitHub - Deploy keys
+
+If your machine does not have a private key set up for your certificates repository, you can give _match_ a path for one:
+
+Using parameter:
+
+```
+match(git_private_key: '<PATH TO YOUR KEY>')
+```
+
+Using environment variable:
+
+```
+ENV['MATCH_GIT_PRIVATE_KEY'] = '<PATH TO YOUR KEY>'
+match
+```
+
+You can find more information about GitHub basic authentication and personal token generation here: [https://developer.github.com/v3/auth/#basic-authentication](https://developer.github.com/v3/auth/#basic-authentication)
+
 ##### Git Storage on Azure Devops
 
 If you're running a pipeline on Azure Devops and using git storage in a another repository on the same project, you might want to use `bearer` token authentication.
@@ -488,14 +507,14 @@ _match_ stores the certificate (`.cer`) and the private key (`.p12`) files separ
 Decrypt your cert found in `certs/<type>/<unique-id>.cer` as a pem file:
 
 ```no-highlight
-openssl aes-256-cbc -k "<password>" -in "certs/<type>/<unique-id>.cer" -out "cert.der" -a -d
+openssl aes-256-cbc -k "<password>" -in "certs/<type>/<unique-id>.cer" -out "cert.der" -a -d -md [md5|sha256]
 openssl x509 -inform der -in cert.der -out cert.pem
 ```
 
 Decrypt your private key found in `certs/<type>/<unique-id>.p12` as a pem file:
 
 ```no-highlight
-openssl aes-256-cbc -k "<password>" -in "certs/distribution/<unique-id>.p12" -out "key.pem" -a -d
+openssl aes-256-cbc -k "<password>" -in "certs/distribution/<unique-id>.p12" -out "key.pem" -a -d -md [md5|sha256]
 ```
 
 Generate an encrypted p12 file with the same or new password:

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -471,7 +471,7 @@ _deliver_ allows for metadata to be set through `.txt` files in the metadata fol
 
 Key | Editable While Live | Directory | Filename
 ----|--------|--------|--------
-<%- (Deliver::UploadMetadata::NON_LOCALISED_VERSION_VALUES.keys + Deliver::UploadMetadata::NON_LOCALISED_APP_VALUES).each do |value| -%>
+<%- (Deliver::UploadMetadata::NON_LOCALISED_VERSION_VALUES.keys + Deliver::UploadMetadata::NON_LOCALISED_APP_VALUES.keys).each do |value| -%>
   `<%= value %>` | <%= Deliver::UploadMetadata::NON_LOCALISED_LIVE_VALUES.include?(value) ? 'Yes' : 'No' %> | `<metadata_path>` | `<%= value %>.txt`
 <%- end %>
 
@@ -485,10 +485,10 @@ Key | Editable While Live | Directory | Filename
 
 ### Review Information Metadata
 
-Key | Editable While Live | Directory | Filename
-----|--------|--------|--------
+Key | Editable While Live | Directory | Filename | Deprecated Filename
+----|--------|--------|--------|--------
 <%- Deliver::UploadMetadata::REVIEW_INFORMATION_VALUES_LEGACY.each do |key, value| -%>
-  `<%= value %>` | Yes | `<metadata_path>/<%= Deliver::UploadMetadata::REVIEW_INFORMATION_DIR %>` | `<%= value %>.txt`
+  `<%= value %>` | Yes | `<metadata_path>/<%= Deliver::UploadMetadata::REVIEW_INFORMATION_DIR %>` | `<%= value %>.txt` | `<%= key %>.txt`
 <%- end %>
 
 ## Reference