From 3bde9d34a97e39d61fe6b4d5db6784cf4f55ab65 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Fri, 11 Dec 2020 18:58:01 +0100
Subject: [PATCH] Remove `version` from `Livecheck`.

---
 Library/Homebrew/livecheck.rb                 | 12 -----------
 Library/Homebrew/livecheck/livecheck.rb       |  7 +------
 .../Homebrew/test/livecheck/livecheck_spec.rb |  1 -
 Library/Homebrew/test/livecheck_spec.rb       | 21 -------------------
 4 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/Library/Homebrew/livecheck.rb b/Library/Homebrew/livecheck.rb
index 7f329e0996..7fb6c3bb2b 100644
--- a/Library/Homebrew/livecheck.rb
+++ b/Library/Homebrew/livecheck.rb
@@ -20,7 +20,6 @@ class Livecheck
     @skip_msg = nil
     @strategy = nil
     @url = nil
-    @version = nil
   end
 
   # Sets the `@regex` instance variable to the provided `Regexp` or returns the
@@ -104,16 +103,6 @@ class Livecheck
     end
   end
 
-  # TODO: documentation
-  def version(val = nil)
-    return @version if val.nil?
-    unless val.is_a?(String) || (val.is_a?(Symbol) && Cask::DSL::Version.method_defined?(val))
-      raise TypeError, "Livecheck#version expects a String or valid Symbol"
-    end
-
-    @version = val
-  end
-
   # Returns a `Hash` of all instance variable values.
   # @return [Hash]
   def to_hash
@@ -123,7 +112,6 @@ class Livecheck
       "skip_msg" => @skip_msg,
       "strategy" => @strategy,
       "url"      => @url,
-      "version"  => @version,
     }
   end
 end
diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
index 6b4b2273b6..fdd387ff50 100644
--- a/Library/Homebrew/livecheck/livecheck.rb
+++ b/Library/Homebrew/livecheck/livecheck.rb
@@ -113,17 +113,12 @@ module Homebrew
         # head-only formulae. A formula with `stable` and `head` that's
         # installed using `--head` will still use the `stable` version for
         # comparison.
-        livecheck_version = formula_or_cask.livecheck.version
-        current = if livecheck_version.is_a?(String)
-          Version.new(livecheck_version)
-        elsif formula
+        current = if formula
           if formula.head_only?
             formula.any_installed_version.version.commit
           else
             formula.stable.version
           end
-        elsif livecheck_version.is_a?(Symbol)
-          Version.new(Cask::DSL::Version.new(formula_or_cask.version).try(livecheck_version))
         else
           Version.new(formula_or_cask.version)
         end
diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb
index 0323c1e1a8..635b829196 100644
--- a/Library/Homebrew/test/livecheck/livecheck_spec.rb
+++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb
@@ -85,7 +85,6 @@ describe Homebrew::Livecheck do
 
         livecheck do
           url "https://formulae.brew.sh/api/formula/ruby.json"
-          version :before_comma
           regex(/"stable":"(\d+(?:\.\d+)+)"/i)
         end
       end
diff --git a/Library/Homebrew/test/livecheck_spec.rb b/Library/Homebrew/test/livecheck_spec.rb
index 0aa2905d81..84ed8df539 100644
--- a/Library/Homebrew/test/livecheck_spec.rb
+++ b/Library/Homebrew/test/livecheck_spec.rb
@@ -107,26 +107,6 @@ describe Livecheck do
     end
   end
 
-  describe "#version" do
-    it "returns nil if not set" do
-      expect(livecheckable.version).to be nil
-    end
-
-    it "returns value if set" do
-      livecheckable.version("1.2.3")
-      expect(livecheckable.version).to eq("1.2.3")
-
-      livecheckable.version(:before_comma)
-      expect(livecheckable.version).to eq(:before_comma)
-    end
-
-    it "raises a TypeError if the argument isn't a String or Symbol" do
-      expect {
-        livecheckable.version(/foo/)
-      }.to raise_error(TypeError, "Livecheck#version expects a String or valid Symbol")
-    end
-  end
-
   describe "#to_hash" do
     it "returns a Hash of all instance variables" do
       expect(livecheckable.to_hash).to eq(
@@ -136,7 +116,6 @@ describe Livecheck do
           "skip_msg" => nil,
           "strategy" => nil,
           "url"      => nil,
-          "version"  => nil,
         },
       )
     end