From 0b0fcdcdd272c60ebe54ae5e3c5b8cce49130b17 Mon Sep 17 00:00:00 2001
From: Razvan Azamfirei <azamfireirazvan@gmail.com>
Date: Thu, 2 May 2024 16:59:33 -0400
Subject: [PATCH] homebrew/cask-versions: remove

---
 Library/Homebrew/cask/audit.rb           |  2 +-
 Library/Homebrew/cask/dsl/caveats.rb     |  2 +-
 Library/Homebrew/official_taps.rb        |  2 +-
 Library/Homebrew/tap_constants.rb        |  4 ++--
 Library/Homebrew/test/cask/audit_spec.rb | 16 ----------------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb
index bb3de17d02..80e46bd50f 100644
--- a/Library/Homebrew/cask/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -430,7 +430,7 @@ module Cask
       add_error "cask token contains .app" if token.end_with? ".app"
 
       match_data = /-(?<designation>alpha|beta|rc|release-candidate)$/.match(cask.token)
-      if match_data && cask.tap&.official? && cask.tap != "homebrew/cask-versions"
+      if match_data && cask.tap&.official?
         add_error "cask token contains version designation '#{match_data[:designation]}'"
       end
 
diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
index 53b029e75e..5996753807 100644
--- a/Library/Homebrew/cask/dsl/caveats.rb
+++ b/Library/Homebrew/cask/dsl/caveats.rb
@@ -135,7 +135,7 @@ module Cask
         else
           <<~EOS
             #{@cask} requires Java #{java_version}. You can install it with:
-              brew install --cask homebrew/cask-versions/temurin#{java_version}
+              brew install --cask temurin@#{java_version}
           EOS
         end
       end
diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb
index d013421051..e737592650 100644
--- a/Library/Homebrew/official_taps.rb
+++ b/Library/Homebrew/official_taps.rb
@@ -4,7 +4,6 @@
 OFFICIAL_CASK_TAPS = %w[
   cask
   cask-fonts
-  cask-versions
 ].freeze
 
 OFFICIAL_CMD_TAPS = {
@@ -20,6 +19,7 @@ DEPRECATED_OFFICIAL_TAPS = %w[
   binary
   cask-drivers
   cask-eid
+  cask-versions
   completions
   devel-only
   dupes
diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb
index 221c696e25..546dd36613 100644
--- a/Library/Homebrew/tap_constants.rb
+++ b/Library/Homebrew/tap_constants.rb
@@ -36,10 +36,10 @@ HOMEBREW_TAP_DIR_REGEX = T.let(
 HOMEBREW_TAP_PATH_REGEX = T.let(Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{(?:/.*)?\Z}.source).freeze, Regexp)
 # Match official cask taps, e.g `homebrew/cask`.
 HOMEBREW_CASK_TAP_REGEX = T.let(
-  %r{(?:([Cc]askroom)/(cask|versions)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))},
+  %r{(?:([Cc]askroom)/(cask)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))},
   Regexp,
 )
-# Match official taps' casks, e.g. `homebrew/cask/somecask` or `homebrew/cask-versions/somecask`.
+# Match official taps' casks, e.g. `homebrew/cask/somecask`.
 HOMEBREW_CASK_TAP_CASK_REGEX = T.let(
   %r{\A#{HOMEBREW_CASK_TAP_REGEX.source}/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z},
   Regexp,
diff --git a/Library/Homebrew/test/cask/audit_spec.rb b/Library/Homebrew/test/cask/audit_spec.rb
index 3c0ae7db0b..72a330e61d 100644
--- a/Library/Homebrew/test/cask/audit_spec.rb
+++ b/Library/Homebrew/test/cask/audit_spec.rb
@@ -335,22 +335,6 @@ RSpec.describe Cask::Audit, :cask do
         end
       end
 
-      context "when cask token contains version designation" do
-        let(:cask_token) { "token-beta" }
-
-        it "fails if the cask is from an official tap" do
-          allow(cask).to receive(:tap).and_return(CoreCaskTap.instance)
-
-          expect(run).to error_with(/token contains version designation/)
-        end
-
-        it "does not fail if the cask is from the `cask-versions` tap" do
-          allow(cask).to receive(:tap).and_return(Tap.fetch("homebrew/cask-versions"))
-
-          expect(run).to pass
-        end
-      end
-
       context "when cask token contains launcher" do
         let(:cask_token) { "token-launcher" }