fastlane 2.139.0 → 2.144.0

data/deliver/lib/deliver/runner.rb

@@ -140,14 +140,25 @@ module Deliver
     # Upload the binary to App Store Connect
     def upload_binary
       UI.message("Uploading binary to App Store Connect")
-      if options[:ipa]
+
+      upload_ipa = options[:ipa]
+      upload_pkg = options[:pkg]
+
+      # 2020-01-27
+      # Only verify platform if if both ipa and pkg exists (for backwards support)
+      if upload_ipa && upload_pkg
+        upload_ipa = ["ios", "appletvos"].include?(options[:platform])
+        upload_pkg = options[:platform] == "osx"
+      end
+
+      if upload_ipa
         package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
           app_id: options[:app].apple_id,
           ipa_path: options[:ipa],
           package_path: "/tmp",
           platform: options[:platform]
         )
-      elsif options[:pkg]
+      elsif upload_pkg
         package_path = FastlaneCore::PkgUploadPackageBuilder.new.generate(
           app_id: options[:app].apple_id,
           pkg_path: options[:pkg],

data/fastlane/lib/fastlane/action.rb

@@ -110,7 +110,7 @@ module Fastlane
 
     # Is printed out in the Steps: output in the terminal
     # Return nil if you don't want any logging in the terminal/JUnit Report
-    def self.step_text
+    def self.step_text(params)
       self.action_name
     end
 

data/fastlane/lib/fastlane/actions/README.md

@@ -1,3 +1,5 @@
 All built-in integrations are available in this directory. Use the `fastlane new_action` command to create a new action.
 
 _fastlane_ will automatically detect the files in this folder
+
+All available actions are listed and documented on https://docs.fastlane.tools/actions/. Documentation for individual actions is available on https://docs.fastlane.tools/actions/%action_name%, e.g. https://docs.fastlane.tools/actions/copy_artifacts/. 

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -1,14 +1,18 @@
+require 'ostruct'
+
 module Fastlane
   module Actions
     module SharedValues
       LATEST_BUILD_NUMBER = :LATEST_BUILD_NUMBER
+      LATEST_VERSION = :LATEST_VERSION
     end
 
     class AppStoreBuildNumberAction < Action
       def self.run(params)
         require 'spaceship'
 
-        build_nr = get_build_number(params)
+        result = get_build_number(params)
+        build_nr = result.build_nr
 
         # Convert build_nr to int (for legacy use) if no "." in string
         if build_nr.kind_of?(String) && !build_nr.include?(".")
@@ -16,6 +20,9 @@ module Fastlane
         end
 
         Actions.lane_context[SharedValues::LATEST_BUILD_NUMBER] = build_nr
+        Actions.lane_context[SharedValues::LATEST_VERSION] = result.build_v
+
+        return build_nr
       end
 
       def self.get_build_number(params)
@@ -33,7 +40,7 @@ module Fastlane
 
           UI.message("Latest upload for live-version #{app.live_version.version} is build: #{build_nr}")
 
-          return build_nr
+          return OpenStruct.new({ build_nr: build_nr, build_v: app.live_version.version })
         else
           version_number = params[:version]
           platform = params[:platform]
@@ -61,7 +68,7 @@ module Fastlane
           if build
             build_nr = build.version
             UI.message("Latest upload for version #{build.app_version} on #{platform_message} is build: #{build_nr}")
-            return build_nr
+            return OpenStruct.new({ build_nr: build_nr, build_v: build.app_version })
           end
 
           # Let user know that build couldn't be found
@@ -72,7 +79,7 @@ module Fastlane
           else
             build_nr = params[:initial_build_number]
             UI.message("Using initial build number of #{build_nr}")
-            return build_nr
+            return OpenStruct.new({ build_nr: build_nr, build_v: version_number })
           end
         end
       end
@@ -159,7 +166,8 @@ module Fastlane
 
       def self.output
         [
-          ['LATEST_BUILD_NUMBER', 'The latest build number of either live or testflight version']
+          ['LATEST_BUILD_NUMBER', 'The latest build number of either live or testflight version'],
+          ['LATEST_VERSION', 'The version of the latest build number']
         ]
       end
 

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

@@ -3,6 +3,8 @@ module Fastlane
   module Actions
     class AutomaticCodeSigningAction < Action
       def self.run(params)
+        UI.deprecated("The `automatic_code_signing` action has been deprecated,")
+        UI.deprecated("Please use `update_code_signing_settings` action instead.")
         FastlaneCore::PrintTable.print_values(config: params, title: "Summary for Automatic Codesigning")
         path = params[:path]
         path = File.join(File.expand_path(path), "project.pbxproj")
@@ -201,7 +203,11 @@ module Fastlane
       end
 
       def self.category
-        :code_signing
+        :deprecated
+      end
+
+      def self.deprecated_notes
+        "Please use `update_code_signing_settings` action instead."
       end
 
       def self.return_value

data/fastlane/lib/fastlane/actions/build_app.rb

@@ -1,13 +1,164 @@
 module Fastlane
   module Actions
-    require 'fastlane/actions/build_ios_app'
-    class BuildAppAction < BuildIosAppAction
-      #####################################################
-      # @!group Documentation
-      #####################################################
+    module SharedValues
+      IPA_OUTPUT_PATH ||= :IPA_OUTPUT_PATH
+      PKG_OUTPUT_PATH ||= :PKG_OUTPUT_PATH
+      DSYM_OUTPUT_PATH ||= :DSYM_OUTPUT_PATH
+      XCODEBUILD_ARCHIVE ||= :XCODEBUILD_ARCHIVE # originally defined in XcodebuildAction
+    end
+
+    class BuildAppAction < 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
+        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_output_path = File.expand_path(gym_output_path)
+
+        # Binary path
+        if File.extname(absolute_output_path) == ".ipa"
+          absolute_dsym_path = absolute_output_path.gsub(/.ipa$/, ".app.dSYM.zip")
+
+          Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] = absolute_output_path
+          ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_output_path # for deliver
+        elsif File.extname(absolute_output_path) == ".pkg"
+          absolute_dsym_path = absolute_output_path.gsub(/.pkg$/, ".dSYM.zip")
+
+          Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] = absolute_output_path
+          ENV[SharedValues::PKG_OUTPUT_PATH.to_s] = absolute_output_path # for deliver
+        end
+
+        # xcarchive path
+        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] = Gym::BuildCommandGenerator.archive_path
+
+        # dSYM path
+        if absolute_dsym_path && File.exist?(absolute_dsym_path)
+          Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path
+          ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path
+        end
+
+        return absolute_output_path
+      end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def self.description
-        "Alias for the `build_ios_app` action"
+        "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'],
+          ['PKG_OUTPUT_PATH', 'The path to the newly generated pkg file'],
+          ['DSYM_OUTPUT_PATH', 'The path to the dSYM files'],
+          ['XCODEBUILD_ARCHIVE', 'The path to the xcodebuild archive']
+        ]
+      end
+
+      def self.return_value
+        "The absolute path to the generated ipa file"
+      end
+
+      def self.author
+        "KrauseFx"
+      end
+
+      def self.available_options
+        require 'gym'
+        Gym::Options.available_options
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+
+      def self.example_code
+        [
+          'build_app(scheme: "MyApp", workspace: "MyApp.xcworkspace")',
+          'build_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_app"',
+          'build_ios_app    # alias for "build_app (only iOS options)"',
+          'build_mac_app    # alias for "build_app (only macOS options)"'
+        ]
+      end
+
+      def self.category
+        :building
+      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")
       end
     end
   end

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