Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[action][spm] add simulator flag for swift compiler #21707

Merged
merged 17 commits into from Dec 19, 2023
Merged

[action][spm] add simulator flag for swift compiler #21707

Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
27f4904
Add simulator flag to spm action for swift compiler
gharary Dec 9, 2023
50e3f57
add user entry syntax check
gharary Dec 10, 2023
52c9b05
removing ipadsimulator from syntax check
gharary Dec 11, 2023
9b88cd9
Adding verify_block for flag check
gharary Dec 11, 2023
a066d0f
adding simulators list to user_error
gharary Dec 12, 2023
f61944a
Update fastlane/lib/fastlane/actions/spm.rb
gharary Dec 13, 2023
d83f680
Update fastlane/lib/fastlane/actions/spm.rb
gharary Dec 13, 2023
b07b167
Adding unit tests for simulator
gharary Dec 13, 2023
a26bcb1
Fix simulator typo
gharary Dec 13, 2023
a31086b
Update fastlane/spec/actions_specs/spm_spec.rb
gharary Dec 13, 2023
39447f1
Fix typo.
rogerluan Dec 13, 2023
ce01c52
Adding support for different simulator architecture
gharary Dec 15, 2023
dfdb19b
Adding unit tests for simulator architecture
gharary Dec 15, 2023
38334a8
Modify code by extracting the logic into methods
gharary Dec 17, 2023
58de71f
Merge branch 'master' into spm-add-simulator
gharary Dec 17, 2023
810b4bf
Update fastlane/lib/fastlane/actions/spm.rb
gharary Dec 18, 2023
013fc34
Update fastlane/lib/fastlane/actions/spm.rb
gharary Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 20 additions & 1 deletion fastlane/lib/fastlane/actions/spm.rb
View file
Open in desktop
Expand Up @@ -10,6 +10,20 @@ def self.run(params)
cmd << "--configuration #{params[:configuration]}" if params[:configuration]
cmd << "--disable-sandbox" if params[:disable_sandbox]
cmd << "--verbose" if params[:verbose]
if params[:simulator]
# Check if the simulator syntax is correct using a regular expression
unless params[:simulator] =~ /^(iphone|macos)simulator(\d+\.\d+)?$/
UI.error("Invalid simulator syntax. Please use 'iphonesimulator', or 'macossimulator'.")
return
end
simulator_flags = [
"-Xswiftc", "-sdk",
"-Xswiftc", "$(xcrun --sdk #{params[:simulator]} --show-sdk-path)",
"-Xswiftc", "-target",
"-Xswiftc", "x86_64-apple-ios$(xcrun --sdk #{params[:simulator]} --show-sdk-version | cut -d '.' -f 1)-simulator"
rogerluan marked this conversation as resolved.
Show resolved Hide resolved
]
cmd += simulator_flags
end
cmd << params[:command] if package_commands.include?(params[:command])
cmd << "--enable-code-coverage" if params[:enable_code_coverage] && (params[:command] == 'generate-xcodeproj' || params[:command] == 'test')
if params[:xcconfig]
Expand Down Expand Up @@ -93,7 +107,12 @@ def self.available_options
env_name: "FL_SPM_VERBOSE",
description: "Increase verbosity of informational output",
type: Boolean,
default_value: false)
default_value: false),
FastlaneCore::ConfigItem.new(key: :simulator,
env_name: "FL_SPM_SIMULATOR",
description: "Specifies the simulator to pass for Swift Compiler",
gharary marked this conversation as resolved.
Show resolved Hide resolved
type: String,
optional: true)
]
end

Expand Down