From 645b1f89ca1ec3c69f26adb0e37e5b5ddf94fcf9 Mon Sep 17 00:00:00 2001 From: Victor C Tavernari Date: Wed, 2 Nov 2022 12:09:19 +0000 Subject: [PATCH 1/3] Deprecate spm's build_path option --- fastlane/lib/fastlane/actions/spm.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fastlane/lib/fastlane/actions/spm.rb b/fastlane/lib/fastlane/actions/spm.rb index 414e7010deb..95829b8d454 100644 --- a/fastlane/lib/fastlane/actions/spm.rb +++ b/fastlane/lib/fastlane/actions/spm.rb @@ -5,6 +5,7 @@ def self.run(params) cmd = ["swift"] cmd << (package_commands.include?(params[:command]) ? "package" : params[:command]) + cmd << "--scratch-path #{params[:scratch_path]}" if params[:scratch_path] cmd << "--build-path #{params[:build_path]}" if params[:build_path] cmd << "--package-path #{params[:package_path]}" if params[:package_path] cmd << "--configuration #{params[:configuration]}" if params[:configuration] @@ -50,9 +51,13 @@ def self.available_options description: "Enables code coverage for the generated Xcode project when using the 'generate-xcodeproj' and the 'test' command", type: Boolean, optional: true), + FastlaneCore::ConfigItem.new(key: :scratch_path, + env_name: "FL_SPM_SCRATCH_PATH", + description: "Specify build/cache directory [default: ./.build]", + optional: true), FastlaneCore::ConfigItem.new(key: :build_path, env_name: "FL_SPM_BUILD_PATH", - description: "Specify build/cache directory [default: ./.build]", + description: "Specify build/cache directory [default: ./.build] Warning: build_path option is depecrated, use scratch_path instead", optional: true), FastlaneCore::ConfigItem.new(key: :package_path, env_name: "FL_SPM_PACKAGE_PATH", @@ -110,7 +115,7 @@ def self.example_code 'spm', 'spm( command: "build", - build_path: "./build", + scratch_path: "./build", configuration: "release" )', 'spm( From df24c0764c4022d51a6e9f4d3c3a686dfc8fbd3f Mon Sep 17 00:00:00 2001 From: Victor Carvalho Tavernari Date: Tue, 15 Nov 2022 18:15:01 +0000 Subject: [PATCH 2/3] Add deprecated message when use build_path on spm action Co-authored-by: Josh Holtz --- fastlane/lib/fastlane/actions/spm.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/lib/fastlane/actions/spm.rb b/fastlane/lib/fastlane/actions/spm.rb index 95829b8d454..b47826d1e09 100644 --- a/fastlane/lib/fastlane/actions/spm.rb +++ b/fastlane/lib/fastlane/actions/spm.rb @@ -58,6 +58,7 @@ def self.available_options FastlaneCore::ConfigItem.new(key: :build_path, env_name: "FL_SPM_BUILD_PATH", description: "Specify build/cache directory [default: ./.build] Warning: build_path option is depecrated, use scratch_path instead", + deprecated: "`build_path` option is deprecated, use `scratch_path` instead", optional: true), FastlaneCore::ConfigItem.new(key: :package_path, env_name: "FL_SPM_PACKAGE_PATH", From 5f3a2ef82d47c27721042d4ef064d4def3a3d979 Mon Sep 17 00:00:00 2001 From: Victor Carvalho Tavernari Date: Tue, 15 Nov 2022 18:59:45 +0000 Subject: [PATCH 3/3] Remove unnecessary warning message --- fastlane/lib/fastlane/actions/spm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/actions/spm.rb b/fastlane/lib/fastlane/actions/spm.rb index b47826d1e09..8eeab36d037 100644 --- a/fastlane/lib/fastlane/actions/spm.rb +++ b/fastlane/lib/fastlane/actions/spm.rb @@ -57,7 +57,7 @@ def self.available_options optional: true), FastlaneCore::ConfigItem.new(key: :build_path, env_name: "FL_SPM_BUILD_PATH", - description: "Specify build/cache directory [default: ./.build] Warning: build_path option is depecrated, use scratch_path instead", + description: "Specify build/cache directory [default: ./.build]", deprecated: "`build_path` option is deprecated, use `scratch_path` instead", optional: true), FastlaneCore::ConfigItem.new(key: :package_path,