fastlane/lib/fastlane/swift_runner_upgrader.rb in fastlane-2.204.2 vs fastlane/lib/fastlane/swift_runner_upgrader.rb in fastlane-2.204.3
- old
+ new
@@ -214,14 +214,14 @@
# adds build_settings flags to fastlane_runner_target
def add_missing_flags!(dry_run: false)
# Check if upgrade is needed
# If fastlane build settings exists already, we don't need any more changes to the Xcode project
self.fastlane_runner_target.build_configurations.each { |config|
- return false if dry_run && config.build_settings["CODE_SIGN_IDENTITY"].nil?
- return false if dry_run && config.build_settings["MACOSX_DEPLOYMENT_TARGET"].nil?
+ return true if dry_run && config.build_settings["CODE_SIGN_IDENTITY"].nil?
+ return true if dry_run && config.build_settings["MACOSX_DEPLOYMENT_TARGET"].nil?
}
- return true if dry_run
+ return false if dry_run
# Proceed to upgrade
self.fastlane_runner_target.build_configurations.each { |config|
config.build_settings["CODE_SIGN_IDENTITY"] = "-"
config.build_settings["MACOSX_DEPLOYMENT_TARGET"] = "10.12"
@@ -234,14 +234,13 @@
# Check if upgrade is needed
# If fastlane copy files build phase exists already, we don't need any more changes to the Xcode project
phase_copy_sign = self.fastlane_runner_target.copy_files_build_phases.select { |phase_copy| phase_copy.name == "FastlaneRunnerCopySigned" }.first
old_phase_copy_sign = self.fastlane_runner_target.shell_script_build_phases.select { |phase_copy| phase_copy.shell_script == "cd \"${SRCROOT}\"\ncd ../..\ncp \"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" .\n" }.first
- unless phase_copy_sign
- return false if dry_run
- end
- return true if dry_run
+ return true if dry_run && phase_copy_sign.nil?
+
+ return false if dry_run
# Proceed to upgrade
old_phase_copy_sign.remove_from_project unless old_phase_copy_sign.nil?
unless phase_copy_sign