dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #172674 from Homebrew/fix-conflicts

This commit is contained in:
Razvan Azamfirei 2024-05-02 01:58:01 +03:00 committed by GitHub
parent fce970c5d5 95e0034a04
commit 5f47e03bc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Casks/a/arduino.rb
View File

@ -9,7 +9,7 @@ cask "arduino" do
deprecate! date: "2023-12-17", because: :discontinued
conflicts_with cask: "homebrew/cask-versions/arduino-nightly"
conflicts_with cask: "arduino-nightly"
app "Arduino.app"
binary "#{appdir}/Arduino.app/Contents/Java/arduino-builder"

2
Casks/f/forklift.rb
View File

@ -13,7 +13,7 @@ cask "forklift" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/forklift3"
conflicts_with cask: "forklift3"
depends_on macos: ">= :monterey"
app "ForkLift.app"

2
Casks/m/macloggerdx.rb
View File

@ -12,7 +12,7 @@ cask "macloggerdx" do
regex(/Download:\s*v?(\d+(?:\.\d+)+)[\s<]/im)
end
conflicts_with cask: "homebrew/cask-versions/macloggerdx-beta"
conflicts_with cask: "macloggerdx@beta"
depends_on macos: ">= :high_sierra"
app "MacLoggerDX.app"

2
Casks/m/mailmate.rb
View File

@ -14,7 +14,7 @@ cask "mailmate" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/mailmate-beta"
conflicts_with cask: "mailmate@beta"
app "MailMate.app"
binary "#{appdir}/MailMate.app/Contents/Resources/emate"

2
Casks/m/morpheus.rb
View File

@ -10,7 +10,7 @@ cask "morpheus" do
deprecate! date: "2024-04-15", because: :discontinued
conflicts_with cask: "homebrew/cask-versions/morpheus-beta"
conflicts_with cask: "morpheus-beta"
app "Morpheus.app"

2
Casks/m/mumble.rb
View File

@ -13,7 +13,7 @@ cask "mumble" do
strategy :header_match
end
conflicts_with cask: "homebrew/cask-versions/mumble-snapshot"
conflicts_with cask: "mumble@snapshot"
depends_on macos: ">= :high_sierra"
app "Mumble.app"

2
Casks/n/netnewswire.rb
View File

@ -14,7 +14,7 @@ cask "netnewswire" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/netnewswire-beta"
conflicts_with cask: "netnewswire@beta"
depends_on macos: ">= :catalina"
app "NetNewsWire.app"

2
Casks/o/omegat.rb
View File

@ -12,7 +12,7 @@ cask "omegat" do
url "https://sourceforge.net/projects/omegat/rss?path=/OmegaT%20-%20Standard"
end
conflicts_with cask: "homebrew/cask-versions/omegat-latest"
conflicts_with cask: "omegat@latest"
app "OmegaT_#{version}_Mac/OmegaT.app"

2
Casks/o/openra.rb
View File

@ -13,7 +13,7 @@ cask "openra" do
regex(/^release[._-]v?(\d+(?:[.-]\d+)*)$/i)
end
conflicts_with cask: "homebrew/cask-versions/openra-playtest"
conflicts_with cask: "openra-playtest"
app "OpenRA - Dune 2000.app"
app "OpenRA - Red Alert.app"

2
Casks/o/openscad.rb
View File

@ -12,7 +12,7 @@ cask "openscad" do
regex(/href=.*?OpenSCAD[._-]v?(\d+(?:\.\d+)+)\.dmg/i)
end
conflicts_with cask: "homebrew/cask-versions/openscad-snapshot"
conflicts_with cask: "openscad@snapshot"
app "OpenSCAD.app"
binary "#{appdir}/OpenSCAD.app/Contents/MacOS/OpenSCAD", target: "openscad"

2
Casks/o/openshot-video-editor.rb
View File

@ -13,7 +13,7 @@ cask "openshot-video-editor" do
strategy :github_latest
end
conflicts_with cask: "homebrew/cask-versions/openshot-video-editor-daily"
conflicts_with cask: "openshot-video-editor@daily"
depends_on macos: ">= :catalina"
app "OpenShot Video Editor.app"

14
Casks/p/parallels.rb
View File

@ -17,13 +17,13 @@ cask "parallels" do
auto_updates true
conflicts_with cask: [
"homebrew/cask-versions/parallels12",
"homebrew/cask-versions/parallels13",
"homebrew/cask-versions/parallels14",
"homebrew/cask-versions/parallels15",
"homebrew/cask-versions/parallels16",
"homebrew/cask-versions/parallels17",
"homebrew/cask-versions/parallels18",
"parallels15",
"parallels@12",
"parallels@13",
"parallels@14",
"parallels@16",
"parallels@17",
"parallels@18",
]
depends_on macos: ">= :monterey"

2
Casks/p/pdf-expert.rb
View File

@ -13,7 +13,7 @@ cask "pdf-expert" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/pdf-expert-beta"
conflicts_with cask: "pdf-expert@beta"
depends_on macos: ">= :monterey"
app "PDF Expert.app"

2
Casks/p/playcover-community.rb
View File

@ -8,7 +8,7 @@ cask "playcover-community" do
homepage "https://github.com/PlayCover/PlayCover"
auto_updates true
conflicts_with cask: "homebrew/cask-versions/playcover-community-beta"
conflicts_with cask: "playcover-community@beta"
depends_on arch: :arm64
depends_on macos: ">= :monterey"

4
Casks/p/processing.rb
View File

@ -20,8 +20,8 @@ cask "processing" do
end
conflicts_with cask: [
"homebrew/cask-versions/processing2",
"homebrew/cask-versions/processing3",
"processing2",
"processing@3",
]
depends_on macos: ">= :catalina"

2
Casks/p/propresenter.rb
View File

@ -40,7 +40,7 @@ cask "propresenter" do
homepage "https://renewedvision.com/propresenter/"
auto_updates true
conflicts_with cask: "homebrew/cask-versions/propresenter-beta"
conflicts_with cask: "propresenter@beta"
app "ProPresenter.app"

2
Casks/q/qbittorrent.rb
View File

@ -24,7 +24,7 @@ cask "qbittorrent" do
desc "Peer to peer Bitorrent client"
homepage "https://www.qbittorrent.org/"
conflicts_with cask: "homebrew/cask-versions/qbittorrent-lt20"
conflicts_with cask: "qbittorrent@lt20"
depends_on macos: ">= :high_sierra"
# Renamed for consistency: app name is different in the Finder and in a shell.

4
Casks/s/sublime-text.rb
View File

@ -15,8 +15,8 @@ cask "sublime-text" do
auto_updates true
conflicts_with cask: [
"homebrew/cask-versions/sublime-text3",
"homebrew/cask-versions/sublime-text-dev",
"sublime-text3",
"sublime-text@dev",
]
app "Sublime Text.app"

2
Casks/t/tor-browser.rb
View File

@ -13,7 +13,7 @@ cask "tor-browser" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/tor-browser-alpha"
conflicts_with cask: "tor-browser@alpha"
depends_on macos: ">= :sierra"
app "Tor Browser.app"

2
Casks/t/transmission.rb
View File

@ -14,7 +14,7 @@ cask "transmission" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/transmission-nightly"
conflicts_with cask: "transmission@nightly"
app "Transmission.app"

2
Casks/t/typora.rb
View File

@ -13,7 +13,7 @@ cask "typora" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/typora-dev"
conflicts_with cask: "typora@dev"
depends_on macos: ">= :catalina"
app "Typora.app"

2
Casks/u/utm.rb
View File

@ -14,7 +14,7 @@ cask "utm" do
strategy :github_latest
end
conflicts_with cask: "homebrew/cask-versions/utm-beta"
conflicts_with cask: "utm@beta"
depends_on macos: ">= :big_sur"
app "UTM.app"

2
Casks/v/virtualbuddy.rb
View File

@ -21,7 +21,7 @@ cask "virtualbuddy" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/virtualbuddy-beta"
conflicts_with cask: "virtualbuddy@beta"
depends_on arch: :arm64
depends_on macos: ">= :monterey"

2
Casks/v/vlc.rb
View File

@ -16,7 +16,7 @@ cask "vlc" do
end
auto_updates true
conflicts_with cask: "homebrew/cask-versions/vlc-nightly"
conflicts_with cask: "vlc@nightly"
app "VLC.app"
# shim script (https://github.com/Homebrew/homebrew-cask/issues/18809)

12
Casks/v/vmware-fusion.rb
View File

@ -17,12 +17,12 @@ cask "vmware-fusion" do
auto_updates true
conflicts_with cask: [
"homebrew/cask-versions/vmware-fusion7",
"homebrew/cask-versions/vmware-fusion8",
"homebrew/cask-versions/vmware-fusion10",
"homebrew/cask-versions/vmware-fusion11",
"homebrew/cask-versions/vmware-fusion12",
"homebrew/cask-versions/vmware-fusion-tech-preview",
"vmware-fusion-tech@preview",
"vmware-fusion10",
"vmware-fusion11",
"vmware-fusion12",
"vmware-fusion7",
"vmware-fusion8",
]
depends_on macos: ">= :monterey"

2
Casks/w/wezterm.rb
View File

@ -16,7 +16,7 @@ cask "wezterm" do
end
end
conflicts_with cask: "homebrew/cask-versions/wezterm-nightly"
conflicts_with cask: "wezterm@nightly"
app "WezTerm.app"
%w[