Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions scripts/cocoapods/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def self.apply_xcode_15_patch(installer, xcodebuild_manager: Xcodebuild)

# fix for weak linking
self.safe_init(config, other_ld_flags_key)
if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
if self.is_using_xcode15_0(:xcodebuild_manager => xcodebuild_manager)
self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
else
self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
Expand Down Expand Up @@ -299,7 +299,7 @@ def self.remove_value_from_setting_if_present(config, setting_name, value)
end
end

def self.is_using_xcode15_or_greter(xcodebuild_manager: Xcodebuild)
def self.is_using_xcode15_0(xcodebuild_manager: Xcodebuild)
xcodebuild_version = xcodebuild_manager.version

# The output of xcodebuild -version is something like
Expand All @@ -310,7 +310,8 @@ def self.is_using_xcode15_or_greter(xcodebuild_manager: Xcodebuild)
regex = /(\d+)\.(\d+)(?:\.(\d+))?/
if match_data = xcodebuild_version.match(regex)
major = match_data[1].to_i
return major >= 15
minor = match_data[2].to_i
return major == 15 && minor == 0
end

return false
Expand Down