From 3561675f7f977e4d433ae815166e24ab48827568 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:50:40 -0400 Subject: [PATCH 01/25] chromedriver: fix conflicts --- Casks/c/chromedriver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/c/chromedriver.rb b/Casks/c/chromedriver.rb index d138048563256..29aacba9eef39 100644 --- a/Casks/c/chromedriver.rb +++ b/Casks/c/chromedriver.rb @@ -19,7 +19,7 @@ end end - conflicts_with cask: "chromedriver-beta" + conflicts_with cask: "chromedriver@beta" binary "chromedriver-mac-#{arch}/chromedriver" From 6e7fb63fb6f040d198c03015660cdd1b29edbb7d Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:06 -0400 Subject: [PATCH 02/25] firefox@cn: fix conflicts --- Casks/f/firefox@cn.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Casks/f/firefox@cn.rb b/Casks/f/firefox@cn.rb index 456a139c41392..31645cdaff794 100644 --- a/Casks/f/firefox@cn.rb +++ b/Casks/f/firefox@cn.rb @@ -13,11 +13,10 @@ end auto_updates true - conflicts_with cask: %w[ - firefox - firefox@beta - firefox@developer-edition - firefox@esr + conflicts_with cask: [ + "firefox", + "firefox@beta", + "firefox@esr", ] depends_on macos: ">= :catalina" From 7c32f0d1e454cdaa70530a3d2b7346f57e110efd Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:14 -0400 Subject: [PATCH 03/25] macfuse: fix conflicts --- Casks/m/macfuse.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/m/macfuse.rb b/Casks/m/macfuse.rb index ff97eb837b803..77f22a19dfabc 100644 --- a/Casks/m/macfuse.rb +++ b/Casks/m/macfuse.rb @@ -14,7 +14,7 @@ end auto_updates true - conflicts_with cask: "macfuse-dev" + conflicts_with cask: "macfuse@dev" depends_on macos: ">= :sierra" pkg "Extras/macFUSE #{version}.pkg" From 4d01001b38bfdca6980ce67e5beb7f742bb7eee5 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:22 -0400 Subject: [PATCH 04/25] mi: fix conflicts --- Casks/m/mi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/m/mi.rb b/Casks/m/mi.rb index 9ded96ed3ef19..26fe39e75f5d7 100644 --- a/Casks/m/mi.rb +++ b/Casks/m/mi.rb @@ -12,7 +12,7 @@ strategy :sparkle, &:short_version end - conflicts_with cask: "mi-beta" + conflicts_with cask: "mi@beta" depends_on macos: ">= :high_sierra" app "mi.app" From 738b17beee43dc775744870f580af3a5c71fa321 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:31 -0400 Subject: [PATCH 05/25] mixxx: fix conflicts --- Casks/m/mixxx.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/m/mixxx.rb b/Casks/m/mixxx.rb index eb46897d12386..e264a39fe9c4b 100644 --- a/Casks/m/mixxx.rb +++ b/Casks/m/mixxx.rb @@ -12,7 +12,7 @@ regex(%r{href=.*?/mixxx[._-]v?(\d+(?:\.\d+)+)[._-]macos(?:intel|arm)\.dmg}i) end - conflicts_with cask: "mixxx-snapshot" + conflicts_with cask: "mixxx@snapshot" app "Mixxx.app" From a083218a6c44624f15002d461be74e7f8c74b81e Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:38 -0400 Subject: [PATCH 06/25] mullvadvpn: fix conflicts --- Casks/m/mullvadvpn.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/m/mullvadvpn.rb b/Casks/m/mullvadvpn.rb index ac717916d6261..3cf2fff2ce5ad 100644 --- a/Casks/m/mullvadvpn.rb +++ b/Casks/m/mullvadvpn.rb @@ -13,7 +13,7 @@ strategy :header_match end - conflicts_with cask: "mullvadvpn-beta" + conflicts_with cask: "mullvadvpn@beta" depends_on macos: ">= :big_sur" pkg "MullvadVPN-#{version}.pkg" From db680c03f77627878dffa6991b20d4ae91123448 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:51:49 -0400 Subject: [PATCH 07/25] openemu: fix conflicts --- Casks/o/openemu.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/o/openemu.rb b/Casks/o/openemu.rb index 69c62fd6b9a2f..7bf77542086c0 100644 --- a/Casks/o/openemu.rb +++ b/Casks/o/openemu.rb @@ -19,7 +19,7 @@ homepage "https://openemu.org/" auto_updates true - conflicts_with cask: "openemu-experimental" + conflicts_with cask: "openemu@experimental" app "OpenEmu.app" From 9e6dd2a75017ddc143319493c6fb9b2eac8e5bcb Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:06 -0400 Subject: [PATCH 08/25] parallels@12: fix conflicts --- Casks/p/parallels@12.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@12.rb b/Casks/p/parallels@12.rb index a830b6005647b..cde85ab742747 100644 --- a/Casks/p/parallels@12.rb +++ b/Casks/p/parallels@12.rb @@ -15,14 +15,14 @@ end end - conflicts_with cask: %w[ - parallels - parallels13 - parallels14 - parallels15 - parallels16 - parallels17 - parallels18 + conflicts_with cask: [ + "parallels", + "parallels@13", + "parallels@14", + "parallels@15", + "parallels@16", + "parallels@17", + "parallels@18", ] depends_on macos: "<= :sierra" From 63615224bfee1b08c441b1ca7fedb29d50d8324b Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:21 -0400 Subject: [PATCH 09/25] parallels@13: fix conflicts --- Casks/p/parallels@13.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@13.rb b/Casks/p/parallels@13.rb index e3aafc2fb7984..0994f08ea3fa3 100644 --- a/Casks/p/parallels@13.rb +++ b/Casks/p/parallels@13.rb @@ -15,14 +15,14 @@ end end - conflicts_with cask: %w[ - parallels - parallels12 - parallels14 - parallels15 - parallels16 - parallels17 - parallels18 + conflicts_with cask: [ + "parallels", + "parallels@12", + "parallels@14", + "parallels@15", + "parallels@16", + "parallels@17", + "parallels@18", ] depends_on macos: "<= :high_sierra" From 712090405f30a6f85edbffdfa53f5b3e48557408 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:27 -0400 Subject: [PATCH 10/25] parallels@14: fix conflicts --- Casks/p/parallels@14.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@14.rb b/Casks/p/parallels@14.rb index 406c3f0feb407..d7c8226a5b340 100644 --- a/Casks/p/parallels@14.rb +++ b/Casks/p/parallels@14.rb @@ -16,14 +16,14 @@ end auto_updates true - conflicts_with cask: %w[ - parallels - parallels12 - parallels13 - parallels15 - parallels16 - parallels17 - parallels18 + conflicts_with cask: [ + "parallels", + "parallels@12", + "parallels@13", + "parallels@15", + "parallels@16", + "parallels@17", + "parallels@18", ] depends_on macos: [ :el_capitan, From cc5a741feabc931ae2fa29c3563c8555ec8a0507 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:34 -0400 Subject: [PATCH 11/25] parallels@16: fix conflicts --- Casks/p/parallels@16.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@16.rb b/Casks/p/parallels@16.rb index 1b49b8c58f043..37a0bf34f6eab 100644 --- a/Casks/p/parallels@16.rb +++ b/Casks/p/parallels@16.rb @@ -16,14 +16,14 @@ end auto_updates true - conflicts_with cask: %w[ - parallels - parallels12 - parallels13 - parallels14 - parallels15 - parallels17 - parallels18 + conflicts_with cask: [ + "parallels", + "parallels@12", + "parallels@13", + "parallels@14", + "parallels@15", + "parallels@17", + "parallels@18", ] depends_on macos: ">= :high_sierra" From 0994e7f9dafb66ff194e6143bf8e3e7a8f36b7b3 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:40 -0400 Subject: [PATCH 12/25] parallels@17: fix conflicts --- Casks/p/parallels@17.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@17.rb b/Casks/p/parallels@17.rb index 3294ab55541c5..85f948bd87f72 100644 --- a/Casks/p/parallels@17.rb +++ b/Casks/p/parallels@17.rb @@ -16,14 +16,14 @@ end auto_updates true - conflicts_with cask: %w[ - parallels - parallels12 - parallels13 - parallels14 - parallels15 - parallels16 - parallels18 + conflicts_with cask: [ + "parallels", + "parallels@12", + "parallels@13", + "parallels@14", + "parallels@15", + "parallels@16", + "parallels@18", ] depends_on macos: ">= :high_sierra" From 17d61610bbc3221ade6b33ecc8c9172df6acf409 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:49 -0400 Subject: [PATCH 13/25] parallels@18: fix conflicts --- Casks/p/parallels@18.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Casks/p/parallels@18.rb b/Casks/p/parallels@18.rb index 6fe8e6dad5420..e374ef6f62429 100644 --- a/Casks/p/parallels@18.rb +++ b/Casks/p/parallels@18.rb @@ -16,14 +16,14 @@ end auto_updates true - conflicts_with cask: %w[ - parallels - parallels12 - parallels13 - parallels14 - parallels15 - parallels16 - parallels17 + conflicts_with cask: [ + "parallels", + "parallels@12", + "parallels@13", + "parallels@14", + "parallels@15", + "parallels@16", + "parallels@17", ] depends_on macos: ">= :mojave" From 6679052f3bd2d9251852fbc4c19626f68a2d07f9 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:52:59 -0400 Subject: [PATCH 14/25] picoscope: fix conflicts --- Casks/p/picoscope.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/p/picoscope.rb b/Casks/p/picoscope.rb index 99cb893127c60..c7136c99409f4 100644 --- a/Casks/p/picoscope.rb +++ b/Casks/p/picoscope.rb @@ -12,7 +12,7 @@ regex(%r{href=.*?/PicoScope[._-]v?(\d+(?:.\d+)+)[._-]T(?:and|n)M[._-]Stable\.pkg}i) end - conflicts_with cask: "picoscope-beta" + conflicts_with cask: "picoscope@beta" depends_on macos: ">= :high_sierra" pkg "PicoScope_#{version}_TandM_Stable.pkg" From 39fcb0fd997bff60f0e8c90f276f291c894d1bd7 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:53:07 -0400 Subject: [PATCH 15/25] rstudio: fix conflicts --- Casks/r/rstudio.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/r/rstudio.rb b/Casks/r/rstudio.rb index 33132cbac95a4..b447b8705a803 100644 --- a/Casks/r/rstudio.rb +++ b/Casks/r/rstudio.rb @@ -18,7 +18,7 @@ end end - conflicts_with cask: "rstudio-daily" + conflicts_with cask: "rstudio@daily" depends_on macos: ">= :monterey" app "RStudio.app" From d9d3be1501f278c1170ac4d1ddf67edbb304404c Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:53:20 -0400 Subject: [PATCH 16/25] sublime-merge: fix conflicts --- Casks/s/sublime-merge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/s/sublime-merge.rb b/Casks/s/sublime-merge.rb index 069e14a6b16cf..e54deb41ebee2 100644 --- a/Casks/s/sublime-merge.rb +++ b/Casks/s/sublime-merge.rb @@ -14,7 +14,7 @@ end auto_updates true - conflicts_with cask: "sublime-merge-dev" + conflicts_with cask: "sublime-merge@dev" app "Sublime Merge.app" binary "#{appdir}/Sublime Merge.app/Contents/SharedSupport/bin/smerge" From d3db3b746c98a72f6b6e89040d4ee056a45a71ca Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:53:33 -0400 Subject: [PATCH 17/25] surge: fix conflicts --- Casks/s/surge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/s/surge.rb b/Casks/s/surge.rb index ff996b8710d83..867855f394eaf 100644 --- a/Casks/s/surge.rb +++ b/Casks/s/surge.rb @@ -18,7 +18,7 @@ end auto_updates true - conflicts_with cask: "surge4" + conflicts_with cask: "surge@4" depends_on macos: ">= :high_sierra" app "Surge.app" From 096939633e0700a09acb4a2db5d9b0d82f75f3b6 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:53:42 -0400 Subject: [PATCH 18/25] telegram-desktop: fix conflicts --- Casks/t/telegram-desktop.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/t/telegram-desktop.rb b/Casks/t/telegram-desktop.rb index f0651aae0ed2b..6851ba96bfdf3 100644 --- a/Casks/t/telegram-desktop.rb +++ b/Casks/t/telegram-desktop.rb @@ -14,7 +14,7 @@ end auto_updates true - conflicts_with cask: "telegram-desktop-beta" + conflicts_with cask: "telegram-desktop@beta" depends_on macos: ">= :sierra" # Renamed to avoid conflict with telegram From 8cc27f66d2a11fa2723988d71b60a454c7cf1f21 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:56:43 -0400 Subject: [PATCH 19/25] virtualbox: fix conflicts --- Casks/v/virtualbox.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Casks/v/virtualbox.rb b/Casks/v/virtualbox.rb index d5460202d2a00..9c2013f157e24 100644 --- a/Casks/v/virtualbox.rb +++ b/Casks/v/virtualbox.rb @@ -17,7 +17,10 @@ end end - conflicts_with cask: "virtualbox-beta" + conflicts_with cask: [ + "virtualbox@6", + "virtualbox@beta", + ] depends_on macos: ">= :catalina" depends_on arch: :x86_64 From 270d328c596b39f0f0502d32838b63e3812970ee Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:56:52 -0400 Subject: [PATCH 20/25] virtualbox@6: fix conflicts --- Casks/v/virtualbox@6.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Casks/v/virtualbox@6.rb b/Casks/v/virtualbox@6.rb index 2dbde96a399d7..2d7b89058b5b2 100644 --- a/Casks/v/virtualbox@6.rb +++ b/Casks/v/virtualbox@6.rb @@ -15,7 +15,10 @@ end end - conflicts_with cask: "virtualbox-beta" + conflicts_with cask: [ + "virtualbox", + "virtualbox@beta", + ] depends_on macos: ">= :high_sierra" depends_on arch: :x86_64 From d7cdb90738385b339258731c6266a6f29a6ed017 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:57:04 -0400 Subject: [PATCH 21/25] virtualbox@beta: fix conflicts --- Casks/v/virtualbox@beta.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Casks/v/virtualbox@beta.rb b/Casks/v/virtualbox@beta.rb index 569e16ff0f7c9..1c61b4e7ecfbe 100644 --- a/Casks/v/virtualbox@beta.rb +++ b/Casks/v/virtualbox@beta.rb @@ -20,7 +20,10 @@ regex(/href=.*?VirtualBox[._-]v?(\d+(?:[.-]\d+)+.*?)[._-]#{arch}\.dmg(?!.+?development)/i) end - conflicts_with cask: "virtualbox" + conflicts_with cask: [ + "virtualbox", + "virtualbox@6", + ] depends_on macos: ">= :catalina" pkg "VirtualBox.pkg", From 287c1d59ac3b0cd34931bde5b9c576edd37421dd Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:57:17 -0400 Subject: [PATCH 22/25] whoozle-android-file-transfer: fix conflicts --- Casks/w/whoozle-android-file-transfer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/w/whoozle-android-file-transfer.rb b/Casks/w/whoozle-android-file-transfer.rb index b6aff3dd67536..6d31a2e8efd95 100644 --- a/Casks/w/whoozle-android-file-transfer.rb +++ b/Casks/w/whoozle-android-file-transfer.rb @@ -8,7 +8,7 @@ desc "Android File Transfer for Linux" homepage "https://whoozle.github.io/android-file-transfer-linux/" - conflicts_with cask: "whoozle-android-file-transfer-nightly" + conflicts_with cask: "whoozle-android-file-transfer@nightly" app "Android File Transfer for Linux.app" binary "#{appdir}/Android File Transfer for Linux.app/Contents/SharedSupport/bin/aft-mtp-cli" From 65f243e39fb41ff08df9f34fc02c2bb596bcfc91 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:57:27 -0400 Subject: [PATCH 23/25] wine-stable: fix conflicts --- Casks/w/wine-stable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Casks/w/wine-stable.rb b/Casks/w/wine-stable.rb index 61dcaad1f404b..15cd2e785958b 100644 --- a/Casks/w/wine-stable.rb +++ b/Casks/w/wine-stable.rb @@ -32,8 +32,8 @@ end conflicts_with cask: [ - "wine-devel", - "wine-staging", + "wine@devel", + "wine@staging", ] depends_on cask: "gstreamer-runtime" depends_on macos: ">= :catalina" From a58c4dfc3a208c656c23841b33f0ebb915a9f0f0 Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:57:37 -0400 Subject: [PATCH 24/25] wine@devel: fix conflicts --- Casks/w/wine@devel.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/w/wine@devel.rb b/Casks/w/wine@devel.rb index 3764101825eba..7ca22476139db 100644 --- a/Casks/w/wine@devel.rb +++ b/Casks/w/wine@devel.rb @@ -19,7 +19,7 @@ conflicts_with cask: [ "wine-stable", - "wine-staging", + "wine@staging", ] depends_on cask: "gstreamer-runtime" depends_on macos: ">= :catalina" From 319de459c0d6919e538545da82c40f9e3b36f7fb Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Fri, 3 May 2024 08:57:45 -0400 Subject: [PATCH 25/25] wine@staging: fix conflicts --- Casks/w/wine@staging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/w/wine@staging.rb b/Casks/w/wine@staging.rb index 69589e7af14c3..fbc7bfd7e4741 100644 --- a/Casks/w/wine@staging.rb +++ b/Casks/w/wine@staging.rb @@ -19,7 +19,7 @@ conflicts_with cask: [ "wine-stable", - "wine-devel", + "wine@devel", ] depends_on cask: "gstreamer-runtime" depends_on macos: ">= :catalina"