From 823dc28c2164c6db8842ebdf0fce51443c83baec Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Thu, 17 Jun 2021 16:30:52 -0700 Subject: [PATCH 1/3] livecheck/strategy/sparkle: check minimumSystemVersion for compatibility --- Library/Homebrew/livecheck/strategy/sparkle.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Library/Homebrew/livecheck/strategy/sparkle.rb b/Library/Homebrew/livecheck/strategy/sparkle.rb index 733e638248..1c0778205d 100644 --- a/Library/Homebrew/livecheck/strategy/sparkle.rb +++ b/Library/Homebrew/livecheck/strategy/sparkle.rb @@ -115,6 +115,16 @@ module Homebrew next if os && os != "osx" + if OS.mac? && (minimum_system_version = (item > "minimumSystemVersion").first&.text&.strip) + macos_minimum_system_version = begin + MacOS::Version.new(minimum_system_version).strip_patch + rescue MacOSVersionError + nil + end + + next if MacOS.version < macos_minimum_system_version + end + data = { title: title, pub_date: pub_date || Time.new(0), From 4433f4a985e92526bd77705039a3dcbb6d128956 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Mon, 28 Jun 2021 15:48:35 -0400 Subject: [PATCH 2/3] Sparkle: Update minimumSystemVersion condition --- Library/Homebrew/livecheck/strategy/sparkle.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/livecheck/strategy/sparkle.rb b/Library/Homebrew/livecheck/strategy/sparkle.rb index 1c0778205d..bf1f7fb13d 100644 --- a/Library/Homebrew/livecheck/strategy/sparkle.rb +++ b/Library/Homebrew/livecheck/strategy/sparkle.rb @@ -115,7 +115,7 @@ module Homebrew next if os && os != "osx" - if OS.mac? && (minimum_system_version = (item > "minimumSystemVersion").first&.text&.strip) + if (minimum_system_version = item.elements["minimumSystemVersion"]&.text&.gsub(/\A\D+|\D+\z/, "")) macos_minimum_system_version = begin MacOS::Version.new(minimum_system_version).strip_patch rescue MacOSVersionError From 87564b6ccbbfa204076fdc8a258bdcc56aee6873 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Mon, 28 Jun 2021 15:49:40 -0400 Subject: [PATCH 3/3] Sparkle: Use OS::Mac::Version#prerelease? --- Library/Homebrew/livecheck/strategy/sparkle.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/livecheck/strategy/sparkle.rb b/Library/Homebrew/livecheck/strategy/sparkle.rb index bf1f7fb13d..15a81e617e 100644 --- a/Library/Homebrew/livecheck/strategy/sparkle.rb +++ b/Library/Homebrew/livecheck/strategy/sparkle.rb @@ -117,12 +117,12 @@ module Homebrew if (minimum_system_version = item.elements["minimumSystemVersion"]&.text&.gsub(/\A\D+|\D+\z/, "")) macos_minimum_system_version = begin - MacOS::Version.new(minimum_system_version).strip_patch + OS::Mac::Version.new(minimum_system_version).strip_patch rescue MacOSVersionError nil end - next if MacOS.version < macos_minimum_system_version + next if macos_minimum_system_version&.prerelease? end data = {