Merge pull request #2899 from MikeMcQuaid/enable-deprecations

Enable more deprecations.

8 files changed, 15 insertions, 14 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/dsl.rb b/Library/Homebrew/cask/lib/hbc/dsl.rb
index 112ceb943..4045c6dcf 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl.rb
+++ b/Library/Homebrew/cask/lib/hbc/dsl.rb
@@ -203,12 +203,6 @@ module Hbc
       @sha256 ||= arg
     end
 
-    def license(*)
-      # TODO: Uncomment after `license` has been
-      #       removed from all official taps.
-      # odeprecated "Hbc::DSL#license"
-    end
-
     # depends_on uses a load method so that multiple stanzas can be merged
     def depends_on(*args)
       @depends_on ||= DSL::DependsOn.new
diff --git a/Library/Homebrew/compat/hbc.rb b/Library/Homebrew/compat/hbc.rb
index 3ff8fccb7..608d46e37 100644
--- a/Library/Homebrew/compat/hbc.rb
+++ b/Library/Homebrew/compat/hbc.rb
@@ -3,6 +3,7 @@ require "compat/hbc/cli/update"
 require "compat/hbc/cache"
 require "compat/hbc/caskroom"
 require "compat/hbc/cli"
+require "compat/hbc/dsl"
 
 module Hbc
   class << self
diff --git a/Library/Homebrew/compat/hbc/dsl.rb b/Library/Homebrew/compat/hbc/dsl.rb
new file mode 100644
index 000000000..b550501ed
--- /dev/null
+++ b/Library/Homebrew/compat/hbc/dsl.rb
@@ -0,0 +1,7 @@
+module Hbc
+  class DSL
+    def license(*)
+      odeprecated "Hbc::DSL#license"
+    end
+  end
+end
diff --git a/Library/Homebrew/compat/software_spec.rb b/Library/Homebrew/compat/software_spec.rb
index 5efd2aeb4..8b0408d02 100644
--- a/Library/Homebrew/compat/software_spec.rb
+++ b/Library/Homebrew/compat/software_spec.rb
@@ -1,6 +1,6 @@
 class BottleSpecification
   def revision(*args)
-    # odeprecated "BottleSpecification.revision", "BottleSpecification.rebuild"
+    odeprecated "BottleSpecification.revision", "BottleSpecification.rebuild"
     rebuild(*args)
   end
 end
diff --git a/Library/Homebrew/compat/utils.rb b/Library/Homebrew/compat/utils.rb
index f2cca4726..8904f0f2b 100644
--- a/Library/Homebrew/compat/utils.rb
+++ b/Library/Homebrew/compat/utils.rb
@@ -1,8 +1,3 @@
-def shell_profile
-  # odeprecated "shell_profile", "Utils::Shell.profile"
-  Utils::Shell.profile
-end
-
 module Tty
   module_function
 
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index cbd6257d2..c0b00cb64 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -2370,7 +2370,7 @@ class Formula
     #   version '4.8.1'
     # end</pre>
     def fails_with(compiler, &block)
-      # odeprecated "fails_with :llvm" if compiler == :llvm
+      odeprecated "fails_with :llvm" if compiler == :llvm
       specs.each { |spec| spec.fails_with(compiler, &block) }
     end
 
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 0d2b48acc..c6e704350 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -194,7 +194,7 @@ class SoftwareSpec
   end
 
   def fails_with(compiler, &block)
-    # odeprecated "fails_with :llvm" if compiler == :llvm
+    odeprecated "fails_with :llvm" if compiler == :llvm
     compiler_failures << CompilerFailure.create(compiler, &block)
   end
 
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 5a6295394..e3137ac49 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -556,3 +556,7 @@ def with_env(hash)
     ENV.update(old_values)
   end
 end
+
+def shell_profile
+  Utils::Shell.profile
+end