Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable more deprecations. #2899

Merged
merged 2 commits into from Jul 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions Library/Homebrew/cask/lib/hbc/dsl.rb
Expand Up @@ -203,12 +203,6 @@ def sha256(arg = nil)
@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
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/compat/hbc.rb
Expand Up @@ -3,6 +3,7 @@
require "compat/hbc/cache"
require "compat/hbc/caskroom"
require "compat/hbc/cli"
require "compat/hbc/dsl"

module Hbc
class << self
Expand Down
7 changes: 7 additions & 0 deletions Library/Homebrew/compat/hbc/dsl.rb
@@ -0,0 +1,7 @@
module Hbc
class DSL
def license(*)
odeprecated "Hbc::DSL#license"
end
end
end
2 changes: 1 addition & 1 deletion 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
5 changes: 0 additions & 5 deletions 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

Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/formula.rb
Expand Up @@ -2368,7 +2368,7 @@ def cxxstdlib_check(check_type)
# 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

Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/software_spec.rb
Expand Up @@ -194,7 +194,7 @@ def patch(strip = :p1, src = nil, &block)
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

Expand Down
4 changes: 4 additions & 0 deletions Library/Homebrew/utils.rb
Expand Up @@ -556,3 +556,7 @@ def with_env(hash)
ENV.update(old_values)
end
end

def shell_profile
Utils::Shell.profile
end