summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-06-20 13:05:20 +0000
committerBundlerbot <bot@bundler.io>2019-06-20 13:05:20 +0000
commita5bb0da89cec316899b987f269ab0f72d93c2178 (patch)
tree22501502eba58856c209fa07bd568ac9cf540a3a
parentb1a7e4b9d87e46621746f6bb49e9d496b1e2e72e (diff)
parent595dd6af6c9a708130571743d7b95188908b3865 (diff)
downloadbundler-a5bb0da89cec316899b987f269ab0f72d93c2178.tar.gz
Merge #7218
7218: Bump rubocop to 0.71 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that [our build broke](https://travis-ci.org/bundler/bundler/jobs/548144536) due to a dependency incompatibility caused by a new release of `rubocop-performance`. ### What was your diagnosis of the problem? My diagnosis was that our requirements were very loose for `rubocop-performance`, but very strict for `rubocop`, so very likely to break on `rubocop-performance` releases. ### What is your fix for the problem, implemented in this PR? My fix is to upgrade `rubocop` to fix the current issue, and to lock `rubocop-performance` so it doesn't happen again in the future. ### Why did you choose this fix out of the possible options? I chose this fix because it works now and in the future. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
-rw-r--r--bundler.gemspec4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundler.gemspec b/bundler.gemspec
index 6ce881e51a..5e80c9edee 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
s.add_development_dependency "rake", "~> 12.0"
s.add_development_dependency "ronn", "~> 0.7.3"
s.add_development_dependency "rspec", "~> 3.6"
- s.add_development_dependency "rubocop", "= 0.68.1"
- s.add_development_dependency "rubocop-performance", "~> 1.1"
+ s.add_development_dependency "rubocop", "= 0.71.0"
+ s.add_development_dependency "rubocop-performance", "= 1.4.0"
s.files = Dir.glob("{lib,exe}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }