Mike McQuaid 9d539d6b3b
Merge pull request #6704 from MikeMcQuaid/deprecation-disable-remove
Handle 2.2.0 deprecations/disableds
2019-11-13 17:26:30 -08:00

45 lines
976 B
Ruby

# frozen_string_literal: true
module Utils
class Bottles
class << self
undef tag
def tag
MacOS.version.to_sym
end
end
class Collector
private
alias generic_find_matching_tag find_matching_tag
def find_matching_tag(tag)
# Used primarily by developers testing beta macOS releases.
if OS::Mac.prerelease? && ARGV.skip_or_later_bottles?
generic_find_matching_tag(tag)
else
generic_find_matching_tag(tag) ||
find_older_compatible_tag(tag)
end
end
# Find a bottle built for a previous version of macOS.
def find_older_compatible_tag(tag)
tag_version = begin
MacOS::Version.from_symbol(tag)
rescue ArgumentError
return
end
keys.find do |key|
MacOS::Version.from_symbol(key) <= tag_version
rescue ArgumentError
false
end
end
end
end
end