Merge pull request #172674 from Homebrew/fix-conflicts

Homebrew · May 1, 2024 · 5f47e03 · 5f47e03
2 parents fce970c + 95e0034
commit 5f47e03
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 39 deletions.
diff --git a/Casks/a/arduino.rb b/Casks/a/arduino.rb
@@ -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"

diff --git a/Casks/f/forklift.rb b/Casks/f/forklift.rb
@@ -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"

diff --git a/Casks/m/macloggerdx.rb b/Casks/m/macloggerdx.rb
@@ -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"

diff --git a/Casks/m/mailmate.rb b/Casks/m/mailmate.rb
@@ -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"

diff --git a/Casks/m/morpheus.rb b/Casks/m/morpheus.rb
@@ -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"
 

diff --git a/Casks/m/mumble.rb b/Casks/m/mumble.rb
@@ -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"

diff --git a/Casks/n/netnewswire.rb b/Casks/n/netnewswire.rb
@@ -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"

diff --git a/Casks/o/omegat.rb b/Casks/o/omegat.rb
@@ -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"
 

diff --git a/Casks/o/openra.rb b/Casks/o/openra.rb
@@ -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"

diff --git a/Casks/o/openscad.rb b/Casks/o/openscad.rb
@@ -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"

diff --git a/Casks/o/openshot-video-editor.rb b/Casks/o/openshot-video-editor.rb
@@ -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"

diff --git a/Casks/p/parallels.rb b/Casks/p/parallels.rb
@@ -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"
 

diff --git a/Casks/p/pdf-expert.rb b/Casks/p/pdf-expert.rb
@@ -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"

diff --git a/Casks/p/playcover-community.rb b/Casks/p/playcover-community.rb
@@ -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"
 

diff --git a/Casks/p/processing.rb b/Casks/p/processing.rb
@@ -20,8 +20,8 @@
   end
 
   conflicts_with cask: [
-    "homebrew/cask-versions/processing2",
-    "homebrew/cask-versions/processing3",
+    "processing2",
+    "processing@3",
   ]
   depends_on macos: ">= :catalina"
 

diff --git a/Casks/p/propresenter.rb b/Casks/p/propresenter.rb
@@ -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"
 

diff --git a/Casks/q/qbittorrent.rb b/Casks/q/qbittorrent.rb
@@ -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.

diff --git a/Casks/s/sublime-text.rb b/Casks/s/sublime-text.rb
@@ -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"

diff --git a/Casks/t/tor-browser.rb b/Casks/t/tor-browser.rb
@@ -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"

diff --git a/Casks/t/transmission.rb b/Casks/t/transmission.rb
@@ -14,7 +14,7 @@
   end
 
   auto_updates true
-  conflicts_with cask: "homebrew/cask-versions/transmission-nightly"
+  conflicts_with cask: "transmission@nightly"
 
   app "Transmission.app"
 

diff --git a/Casks/t/typora.rb b/Casks/t/typora.rb
@@ -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"

diff --git a/Casks/u/utm.rb b/Casks/u/utm.rb
@@ -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"

diff --git a/Casks/v/virtualbuddy.rb b/Casks/v/virtualbuddy.rb
@@ -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"
 

diff --git a/Casks/v/vlc.rb b/Casks/v/vlc.rb
@@ -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)

diff --git a/Casks/v/vmware-fusion.rb b/Casks/v/vmware-fusion.rb
@@ -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"
 

diff --git a/Casks/w/wezterm.rb b/Casks/w/wezterm.rb
@@ -16,7 +16,7 @@
     end
   end
 
-  conflicts_with cask: "homebrew/cask-versions/wezterm-nightly"
+  conflicts_with cask: "wezterm@nightly"
 
   app "WezTerm.app"
   %w[
-Original file 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 @@