fastlane 2.138.0 → 2.143.0

data/fastlane/lib/fastlane/actions/build_ios_app.rb

@@ -1,150 +1,46 @@
 module Fastlane
   module Actions
-    module SharedValues
-      IPA_OUTPUT_PATH ||= :IPA_OUTPUT_PATH
-      DSYM_OUTPUT_PATH ||= :DSYM_OUTPUT_PATH
-      XCODEBUILD_ARCHIVE ||= :XCODEBUILD_ARCHIVE # originally defined in XcodebuildAction
-    end
-
-    class BuildIosAppAction < Action
-      def self.run(values)
-        require 'gym'
-
-        unless Actions.lane_context[SharedValues::SIGH_PROFILE_TYPE].to_s == "development"
-          values[:export_method] ||= Actions.lane_context[SharedValues::SIGH_PROFILE_TYPE]
-        end
-
-        if Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]
-          # Since Xcode 9 you need to explicitly provide the provisioning profile per app target
-          # If the user is smart and uses match and gym together with fastlane, we can do all
-          # the heavy lifting for them
-          values[:export_options] ||= {}
-          # It's not always a hash, because the user might have passed a string path to a ready plist file
-          # If that's the case, we won't set the provisioning profiles
-          # see https://github.com/fastlane/fastlane/issues/9490
-          if values[:export_options].kind_of?(Hash)
-            match_mapping = (Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING] || {}).dup
-            existing_mapping = (values[:export_options][:provisioningProfiles] || {}).dup
-
-            # Be smart about how we merge those mappings in case there are conflicts
-            mapping_object = Gym::CodeSigningMapping.new
-            hash_to_use = mapping_object.merge_profile_mapping(primary_mapping: existing_mapping,
-                                                             secondary_mapping: match_mapping,
-                                                                export_method: values[:export_method])
-
-            values[:export_options][:provisioningProfiles] = hash_to_use
-          else
-            self.show_xcode_9_warning
-          end
-        elsif Actions.lane_context[SharedValues::SIGH_PROFILE_PATHS]
-          # Since Xcode 9 you need to explicitly provide the provisioning profile per app target
-          # If the user used sigh we can match the profiles from sigh
-          values[:export_options] ||= {}
-          if values[:export_options].kind_of?(Hash)
-            # It's not always a hash, because the user might have passed a string path to a ready plist file
-            # If that's the case, we won't set the provisioning profiles
-            # see https://github.com/fastlane/fastlane/issues/9684
-            values[:export_options][:provisioningProfiles] ||= {}
-            Actions.lane_context[SharedValues::SIGH_PROFILE_PATHS].each do |profile_path|
-              begin
-                profile = FastlaneCore::ProvisioningProfile.parse(profile_path)
-                app_id_prefix = profile["ApplicationIdentifierPrefix"].first
-                bundle_id = profile["Entitlements"]["application-identifier"].gsub("#{app_id_prefix}.", "")
-                values[:export_options][:provisioningProfiles][bundle_id] = profile["Name"]
-              rescue => ex
-                UI.error("Couldn't load profile at path: #{profile_path}")
-                UI.error(ex)
-                UI.verbose(ex.backtrace.join("\n"))
-              end
-            end
-          else
-            self.show_xcode_9_warning
-          end
+    require 'fastlane/actions/build_app'
+    class BuildIosAppAction < BuildAppAction
+      # Gym::Options.available_options keys that don't apply to ios apps.
+      REJECT_OPTIONS = [
+        :pkg,
+        :skip_package_pkg,
+        :catalyst_platform,
+        :installer_cert_name
+      ]
+
+      def self.run(params)
+        # Adding reject options back in  so gym has everything it needs
+        params.available_options += Gym::Options.available_options.select do |option|
+          REJECT_OPTIONS.include?(option.key)
         end
 
-        gym_output_path = Gym::Manager.new.work(values)
-        if gym_output_path.nil?
-          UI.important("No output path received from gym")
-          return nil
-        end
-
-        absolute_ipa_path = File.expand_path(gym_output_path)
-        absolute_dsym_path = absolute_ipa_path.gsub(".ipa", ".app.dSYM.zip")
-
-        # This might be the mac app path, so we don't want to set it here
-        # https://github.com/fastlane/fastlane/issues/5757
-        if absolute_ipa_path.include?(".ipa")
-          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_ipa_path
-          ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
-        end
-
-        Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path if File.exist?(absolute_dsym_path)
-        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] = Gym::BuildCommandGenerator.archive_path
-        ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path if File.exist?(absolute_dsym_path)
-
-        return absolute_ipa_path
-      end
-
-      def self.description
-        "Easily build and sign your app (via _gym_)"
-      end
-
-      def self.details
-        "More information: https://fastlane.tools/gym"
-      end
-
-      def self.output
-        [
-          ['IPA_OUTPUT_PATH', 'The path to the newly generated ipa file'],
-          ['DSYM_OUTPUT_PATH', 'The path to the dSYM files'],
-          ['XCODEBUILD_ARCHIVE', 'The path to the xcodebuild archive']
-        ]
-      end
+        # Defaulting to ios specific values
+        params[:catalyst_platform] = "ios"
 
-      def self.return_value
-        "The absolute path to the generated ipa file"
+        super(params)
       end
 
-      def self.author
-        "KrauseFx"
-      end
+      #####################################################
+      # @!group Documentation
+      #####################################################
 
       def self.available_options
         require 'gym'
-        Gym::Options.available_options
-      end
-
-      def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
-      end
+        require 'gym/options'
 
-      def self.example_code
-        [
-          'build_ios_app(scheme: "MyApp", workspace: "MyApp.xcworkspace")',
-          'build_ios_app(
-            workspace: "MyApp.xcworkspace",
-            configuration: "Debug",
-            scheme: "MyApp",
-            silent: true,
-            clean: true,
-            output_directory: "path/to/dir", # Destination directory. Defaults to current directory.
-            output_name: "my-app.ipa",       # specify the name of the .ipa file to generate (including file extension)
-            sdk: "iOS 11.1"                  # use SDK as the name or path of the base SDK when building the project.
-          )',
-          'gym         # alias for "build_ios_app"',
-          'build_app   # alias for "build_ios_app"'
-        ]
+        Gym::Options.available_options.reject do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
       end
 
-      def self.category
-        :building
+      def self.is_supported?(platform)
+        [:ios].include?(platform)
       end
 
-      def self.show_xcode_9_warning
-        return unless Helper.xcode_at_least?("9.0")
-        UI.message("You passed a path to a custom plist file for exporting the binary.")
-        UI.message("Make sure to include information about what provisioning profiles to use with Xcode 9")
-        UI.message("More information: https://docs.fastlane.tools/codesigning/xcode-project/#xcode-9-and-up")
+      def self.description
+        "Alias for the `build_app` action but only for iOS"
       end
     end
   end

data/fastlane/lib/fastlane/actions/build_mac_app.rb

@@ -0,0 +1,46 @@
+module Fastlane
+  module Actions
+    require 'fastlane/actions/build_app'
+    class BuildMacAppAction < BuildAppAction
+      # Gym::Options.available_options keys that don't apply to mac apps.
+      REJECT_OPTIONS = [
+        :ipa,
+        :skip_package_ipa,
+        :catalyst_platform
+      ]
+
+      def self.run(params)
+        # Adding reject options back in  so gym has everything it needs
+        params.available_options += Gym::Options.available_options.select do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
+
+        # Defaulting to mac specific values
+        params[:catalyst_platform] = "macos"
+
+        super(params)
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.available_options
+        require 'gym'
+        require 'gym/options'
+
+        Gym::Options.available_options.reject do |option|
+          REJECT_OPTIONS.include?(option.key)
+        end
+      end
+
+      def self.is_supported?(platform)
+        [:mac].include?(platform)
+      end
+
+      def self.description
+        "Alias for the `build_app` action but only for macOS"
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/cocoapods.rb

@@ -19,7 +19,7 @@ module Fastlane
 
         cmd << '--no-clean' unless params[:clean]
         cmd << '--no-integrate' unless params[:integrate]
-        cmd << '--clean-install' if params[:clean_install] && pod_version.to_f >= 1.7
+        cmd << '--clean-install' if params[:clean_install] && pod_version(params).to_f >= 1.7
         cmd << '--repo-update' if params[:repo_update]
         cmd << '--silent' if params[:silent]
         cmd << '--verbose' if params[:verbose]
@@ -42,7 +42,7 @@ module Fastlane
         params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
       end
 
-      def self.pod_version
+      def self.pod_version(params)
         use_bundle_exec?(params) ? `bundle exec pod --version` : `pod --version`
       end
 

data/fastlane/lib/fastlane/actions/create_pull_request.rb

@@ -2,6 +2,7 @@ module Fastlane
   module Actions
     module SharedValues
       CREATE_PULL_REQUEST_HTML_URL = :CREATE_PULL_REQUEST_HTML_URL
+      CREATE_PULL_REQUEST_NUMBER = :CREATE_PULL_REQUEST_NUMBER
     end
 
     class CreatePullRequestAction < Action
@@ -39,7 +40,14 @@ module Fastlane
           # Add assignees to pull request
           add_assignees(params, number) if params[:assignees]
 
+          # Add reviewers to pull request
+          add_reviewers(params, number) if params[:reviewers] || params[:team_reviewers]
+
+          # Add a milestone to pull request
+          add_milestone(params, number) if params[:milestone]
+
           Actions.lane_context[SharedValues::CREATE_PULL_REQUEST_HTML_URL] = html_url
+          Actions.lane_context[SharedValues::CREATE_PULL_REQUEST_NUMBER] = number
           return html_url
         end
       end
@@ -82,6 +90,51 @@ module Fastlane
         )
       end
 
+      def self.add_reviewers(params, number)
+        payload = {}
+        if params[:reviewers]
+          payload["reviewers"] = params[:reviewers]
+        end
+
+        if params[:team_reviewers]
+          payload["team_reviewers"] = params[:team_reviewers]
+        end
+        GithubApiAction.run(
+          server_url: params[:api_url],
+          api_token: params[:api_token],
+          http_method: 'POST',
+          path: "repos/#{params[:repo]}/pulls/#{number}/requested_reviewers",
+          body: payload,
+          error_handlers: {
+            '*' => proc do |result|
+              UI.error("GitHub responded with #{result[:status]}: #{result[:body]}")
+              return nil
+            end
+          }
+        )
+      end
+
+      def self.add_milestone(params, number)
+        payload = {}
+        if params[:milestone]
+          payload["milestone"] = params[:milestone]
+        end
+
+        GithubApiAction.run(
+          server_url: params[:api_url],
+          api_token: params[:api_token],
+          http_method: 'PATCH',
+          path: "repos/#{params[:repo]}/issues/#{number}",
+          body: payload,
+          error_handlers: {
+              '*' => proc do |result|
+                UI.error("GitHub responded with #{result[:status]}: #{result[:body]}")
+                return nil
+              end
+          }
+        )
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################
@@ -92,7 +145,8 @@ module Fastlane
 
       def self.output
         [
-          ['CREATE_PULL_REQUEST_HTML_URL', 'The HTML URL to the created pull request']
+          ['CREATE_PULL_REQUEST_HTML_URL', 'The HTML URL to the created pull request'],
+          ['CREATE_PULL_REQUEST_NUMBER', 'The identifier number of the created pull request']
         ]
       end
 
@@ -127,6 +181,11 @@ module Fastlane
                                        description: "The labels for the pull request",
                                        type: Array,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :milestone,
+                                       env_name: "GITHUB_PULL_REQUEST_MILESTONE",
+                                       description: "The milestone ID (Integer) for the pull request",
+                                       type: Numeric,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :head,
                                        env_name: "GITHUB_PULL_REQUEST_HEAD",
                                        description: "The name of the branch where your changes are implemented (defaults to the current branch name)",
@@ -152,12 +211,22 @@ module Fastlane
                                        env_name: "GITHUB_PULL_REQUEST_ASSIGNEES",
                                        description: "The assignees for the pull request",
                                        type: Array,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :reviewers,
+                                       env_name: "GITHUB_PULL_REQUEST_REVIEWERS",
+                                       description: "The reviewers (slug) for the pull request",
+                                       type: Array,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :team_reviewers,
+                                       env_name: "GITHUB_PULL_REQUEST_TEAM_REVIEWERS",
+                                       description: "The team reviewers (slug) for the pull request",
+                                       type: Array,
                                        optional: true)
         ]
       end
 
       def self.author
-        ["seei", "tommeier", "marumemomo"]
+        ["seei", "tommeier", "marumemomo", "elneruda"]
       end
 
       def self.is_supported?(platform)

data/fastlane/lib/fastlane/actions/docs/{build_ios_app.md → build_app.md}

@@ -146,7 +146,7 @@ export_options({
 Optional: If _gym_ can't automatically detect the provisioning profiles to use, you can pass a mapping of bundle identifiers to provisioning profiles:
 
 ```ruby
-build_ios_app(
+build_app(
   scheme: "Release",
   export_options: {
     method: "app-store",

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

@@ -4,7 +4,7 @@
 
 ###### Easily put your screenshots into the right device frames
 
-_frameit_ allows you to put a gorgeous device frame around your iOS and macOS screenshots just by running one simple command. Use _frameit_ to prepare perfect screenshots for the App Store, your website, QA or emails.
+_frameit_ allows you to put a gorgeous device frame around your iOS, macOS and Android screenshots just by running one simple command. Use _frameit_ to prepare perfect screenshots for the App Store, your website, QA or emails.
 
 -------
 
@@ -23,9 +23,10 @@ _frameit_ allows you to put a gorgeous device frame around your iOS and macOS sc
 
 ## Frame screenshot
 
-Put a gorgeous device frame around your iOS and macOS screenshots just by running one simple command. Support for:
+Put a gorgeous device frame around your iOS, macOS and Android screenshots just by running one simple command. Support for:
 
 - iPhone, iPad and Mac
+- Set of Android devices
 - Portrait and Landscape modes
 - Several device frame colors
 
@@ -69,12 +70,18 @@ More information about this process and how to update the frames can be found [h
 
 Why should you have to use Photoshop, just to add a frame around your screenshots?
 
-Just navigate to your folder of screenshots and use the following command:
+Just navigate to your folder of screenshots and use the following command (iOS and Mac OS are default platforms for backward compatibility):
 
 ```no-highlight
 fastlane frameit
 ```
 
+To frame Android screenshots:
+
+```no-highlight
+fastlane frameit android
+```
+
 To use the silver version of the frames:
 
 ```no-highlight
@@ -129,8 +136,10 @@ The general parameters are defined in the `default` key and can be:
 | `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` |
-| `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
+| `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` |
+| `force_device_type` | Forces a specific device. Valid values are: Huawei P8, Motorola Moto E, Motorola Moto G, Nexus 4, Nexus 5X, Nexus 6P, Nexus 9, Samsung Galaxy Grand Prime, Samsung Galaxy Note 5, Samsung Galaxy S Duos, Samsung Galaxy S3, Samsung Galaxy S5, Samsung Galaxy S7, Samsung Galaxy S8, Samsung Galaxy S9, iPhone 5s, iPhone 5c, iPhone SE, iPhone 6s, iPhone 6s Plus, iPhone 7, iPhone 7 Plus, iPhone 8, iPhone 8 Plus, iPhone X, iPhone XS, iPhone XR, iPhone XS Max, iPad Air 2, iPad Mini 4, iPad Pro, MacBook, Google Pixel 3, Google Pixel 3 XL, HTC One A9, HTC One M8 | NA |
 
 ### Specific parameters
 
@@ -142,7 +151,9 @@ These are defined in the `data` key. This is an array with the following keys fo
 | `filter` | This is mandatory to link the individual configuration to the screenshot, based on part of the file name. <p>Example:<br>If a screenshot is named `iPhone 8-Brainstorming.png` you can use value `Brainstorming` for `filter`.  If there are more than one `filter` matching an entry, they will all be applied in order (which means that the last one has the highest precedence). All other keys from that array element will only be applied on this specific screenshot. |
 | `keyword` | Similar use as in `default`, except that parameter `text` can be used here because it is screenshot specific. |
 | `title` | Similar use as in `default`, except that parameter `text` can be used here because it is screenshot specific. |
-| `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
+| `frame` | Overrides the color of the frame to be used. (Valid values are `BLACK`, `WHITE`, `GOLD` and `ROSE_GOLD`) | NA |
+| `use_platform` | Overrides the platform used for the screenshot. Valid values are `IOS`, `ANDROID` and `ANY`. | `IOS` |
+| `force_device_type` | Forces a specific device. Valid values are the same as for the general parameter. | NA |
 
 ### <a name="keyword-and-title-parameters"></a>Framefile `keyword` and `title` parameters
 
@@ -172,7 +183,8 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
     "show_complete_frame": false,
     "stack_title" : false,
     "title_below_image": true,
-    "frame": "WHITE"
+    "frame": "WHITE",
+    "use_platform": "IOS"
   },
 
   "data": [
@@ -200,6 +212,10 @@ The `keyword` and `title` parameters are both used in `default` and `data`. They
       "keyword": {
         "color": "#31bb48"
       }
+    },
+    {
+      "filter": "Android",
+      "use_platform": "ANDROID"
     }
   ]
 }