Skip to content

Add support for the new Release Candidate versions #416

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

Merged
joshdholtz merged 4 commits into from
Nov 30, 2020
Merged

Add support for the new Release Candidate versions #416

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b22fa02
Add support for the new Release Candidate versions
revolter Nov 12, 2020
9381066
Fix RuboCop issue
revolter Nov 12, 2020
e61a059
Fix RuboCop issue
revolter Nov 12, 2020
0d03ed0
Move rubocop disable above method and reenabled below
Nov 30, 2020
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
8 changes: 8 additions & 0 deletions lib/xcode/install.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ def prereleases
links
end

# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
def compare_versions(first, second)
# Sort by version number
numeric_comparation = first.to_f <=> second.to_f
Expand All @@ -481,9 +482,16 @@ def compare_versions(first, second)
return -1 if is_first_gm && !is_second_gm
return 1 if !is_first_gm && is_second_gm

# Return Release Candidate versions before others
is_first_rc = first.include?('RC') || first.include?('Release Candidate')
is_second_rc = second.include?('RC') || second.include?('Release Candidate')
return -1 if is_first_rc && !is_second_rc
return 1 if !is_first_rc && is_second_rc

# Sort alphabetically
first <=> second
end
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

def hdiutil(*args)
io = IO.popen(['hdiutil', *args])
Expand Down