Skip to content
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.

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

various casks: fix conflicts #172674

Merged
merged 26 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ddf610c
arduino: fix conflicts
razvanazamfirei May 1, 2024
7373893
forklift: fix conflicts
razvanazamfirei May 1, 2024
9689e68
macloggerdx: fix conflicts
razvanazamfirei May 1, 2024
222a6c8
mailmate: fix conflicts
razvanazamfirei May 1, 2024
340ab60
morpheus: fix conflicts
razvanazamfirei May 1, 2024
0eb6f42
mumble: fix conflicts
razvanazamfirei May 1, 2024
7022149
netnewswire: fix conflicts
razvanazamfirei May 1, 2024
39f1290
omegat: fix conflicts
razvanazamfirei May 1, 2024
8917c5e
openra: fix conflicts
razvanazamfirei May 1, 2024
9ab40c0
openscad: fix conflicts
razvanazamfirei May 1, 2024
acbcb12
openshot-video-editor: fix conflicts
razvanazamfirei May 1, 2024
3e75dc2
parallels: fix conflicts
razvanazamfirei May 1, 2024
e10e09d
pdf-expert: fix conflicts
razvanazamfirei May 1, 2024
5191e3a
playcover-community: fix conflicts
razvanazamfirei May 1, 2024
ae9c631
processing: fix conflicts
razvanazamfirei May 1, 2024
9285f24
propresenter: fix conflicts
razvanazamfirei May 1, 2024
d0125a9
qbittorrent: fix conflicts
razvanazamfirei May 1, 2024
794a75f
sublime-text: fix conflicts
razvanazamfirei May 1, 2024
1e5e380
tor-browser: fix conflicts
razvanazamfirei May 1, 2024
9abef5a
transmission: fix conflicts
razvanazamfirei May 1, 2024
4854690
typora: fix conflicts
razvanazamfirei May 1, 2024
7fcbce6
utm: fix conflicts
razvanazamfirei May 1, 2024
888db64
virtualbuddy: fix conflicts
razvanazamfirei May 1, 2024
5102d19
vlc: fix conflicts
razvanazamfirei May 1, 2024
075580f
vmware-fusion: fix conflicts
razvanazamfirei May 1, 2024
95e0034
wezterm: fix conflicts
razvanazamfirei May 1, 2024
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
2 changes: 1 addition & 1 deletion Casks/a/arduino.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/f/forklift.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

auto_updates true
conflicts_with cask: "homebrew/cask-versions/forklift3"
conflicts_with cask: "forklift3"
depends_on macos: ">= :monterey"

app "ForkLift.app"
Expand Down
2 changes: 1 addition & 1 deletion Casks/m/macloggerdx.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/m/mailmate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/m/morpheus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

deprecate! date: "2024-04-15", because: :discontinued

conflicts_with cask: "homebrew/cask-versions/morpheus-beta"
conflicts_with cask: "morpheus-beta"

app "Morpheus.app"

Expand Down
2 changes: 1 addition & 1 deletion Casks/m/mumble.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/n/netnewswire.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
end

auto_updates true
conflicts_with cask: "homebrew/cask-versions/netnewswire-beta"
conflicts_with cask: "netnewswire@beta"
depends_on macos: ">= :catalina"

app "NetNewsWire.app"
Expand Down
2 changes: 1 addition & 1 deletion Casks/o/omegat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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"

Expand Down
2 changes: 1 addition & 1 deletion Casks/o/openra.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/o/openscad.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/o/openshot-video-editor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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"
Expand Down
14 changes: 7 additions & 7 deletions Casks/p/parallels.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

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"

Expand Down
2 changes: 1 addition & 1 deletion Casks/p/pdf-expert.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/p/playcover-community.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
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"

Expand Down
4 changes: 2 additions & 2 deletions Casks/p/processing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
end

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

Expand Down
2 changes: 1 addition & 1 deletion Casks/p/propresenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
homepage "https://renewedvision.com/propresenter/"

auto_updates true
conflicts_with cask: "homebrew/cask-versions/propresenter-beta"
conflicts_with cask: "propresenter@beta"

app "ProPresenter.app"

Expand Down
2 changes: 1 addition & 1 deletion Casks/q/qbittorrent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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.
Expand Down
4 changes: 2 additions & 2 deletions Casks/s/sublime-text.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/t/tor-browser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/t/transmission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
end

auto_updates true
conflicts_with cask: "homebrew/cask-versions/transmission-nightly"
conflicts_with cask: "transmission@nightly"

app "Transmission.app"

Expand Down
2 changes: 1 addition & 1 deletion Casks/t/typora.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
end

auto_updates true
conflicts_with cask: "homebrew/cask-versions/typora-dev"
conflicts_with cask: "typora@dev"
depends_on macos: ">= :catalina"

app "Typora.app"
Expand Down
2 changes: 1 addition & 1 deletion Casks/u/utm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion Casks/v/virtualbuddy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
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"

Expand Down
2 changes: 1 addition & 1 deletion Casks/v/vlc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
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)
Expand Down
12 changes: 6 additions & 6 deletions Casks/v/vmware-fusion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

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"

Expand Down
2 changes: 1 addition & 1 deletion Casks/w/wezterm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
end
end

conflicts_with cask: "homebrew/cask-versions/wezterm-nightly"
conflicts_with cask: "wezterm@nightly"

app "WezTerm.app"
%w[
Expand Down
Loading