From bda63fcffcd35174619f349e34fbed63c647900f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 31 Jul 2019 23:56:05 +0200 Subject: Bump rubocop to 0.74.0 And reenable exclusion because the bug why we added them has been fixed. See https://github.com/rubocop-hq/rubocop/issues/6861. --- lib/bundler/friendly_errors.rb | 2 +- lib/bundler/uri_credentials_filter.rb | 2 +- lib/bundler/yaml_serializer.rb | 2 +- spec/support/rubygems_ext.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb index b93ae68012..45faf02020 100644 --- a/lib/bundler/friendly_errors.rb +++ b/lib/bundler/friendly_errors.rb @@ -5,7 +5,7 @@ require_relative "vendored_thor" module Bundler module FriendlyErrors - module_function # rubocop:disable Layout/AccessModifierIndentation + module_function def log_error(error) case error diff --git a/lib/bundler/uri_credentials_filter.rb b/lib/bundler/uri_credentials_filter.rb index 0f6ea4cefa..ee3692268c 100644 --- a/lib/bundler/uri_credentials_filter.rb +++ b/lib/bundler/uri_credentials_filter.rb @@ -2,7 +2,7 @@ module Bundler module URICredentialsFilter - module_function # rubocop:disable Layout/AccessModifierIndentation + module_function def credential_filtered_uri(uri_to_anonymize) return uri_to_anonymize if uri_to_anonymize.nil? diff --git a/lib/bundler/yaml_serializer.rb b/lib/bundler/yaml_serializer.rb index 1965853931..374b3bb5e3 100644 --- a/lib/bundler/yaml_serializer.rb +++ b/lib/bundler/yaml_serializer.rb @@ -3,7 +3,7 @@ module Bundler # A stub yaml serializer that can handle only hashes and strings (as of now). module YAMLSerializer - module_function # rubocop:disable Layout/AccessModifierIndentation + module_function def dump(hash) yaml = String.new("---") diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb index b43bc26a5c..b97b5278ce 100644 --- a/spec/support/rubygems_ext.rb +++ b/spec/support/rubygems_ext.rb @@ -11,7 +11,7 @@ module Spec "rake" => "~> 12.0", "ronn" => "~> 0.7.3", "rspec" => "~> 3.6", - "rubocop" => "= 0.72.0", + "rubocop" => "= 0.74.0", "rubocop-performance" => "= 1.4.0", }.freeze -- cgit v1.2.1