From 44ea01cc2c834fdd7b76bc86573908bc76aec248 Mon Sep 17 00:00:00 2001 From: Dwayne Forde Date: Wed, 8 May 2019 14:47:49 -0400 Subject: [PATCH] Upgrade rubocop to 0.68.1 and adds rubocop-performance This should have the same result. The extra gem is because this rubocop-performance functionality was extracted from the main gem and needed to be added back in. More info is in https://github.com/rubocop-hq/rubocop/issues/5977 --- ci/scripts/run-rubocop.sh | 9 ++++++--- license_finder.gemspec | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/scripts/run-rubocop.sh b/ci/scripts/run-rubocop.sh index 6c1c9a008..86a75ea04 100755 --- a/ci/scripts/run-rubocop.sh +++ b/ci/scripts/run-rubocop.sh @@ -4,8 +4,11 @@ cd LicenseFinder bundle install --without runtime default -version=`cat Gemfile.lock | grep ' rubocop' | awk -F'[\(*\)]' '{print $2}'` -gem install rubocop --version $version +rubocop_version=`cat Gemfile.lock | grep ' rubocop' | awk -F'[\(*\)]' '{print $2;exit}'` +rubocop_performance_version=`cat Gemfile.lock | grep ' rubocop-performance' | awk -F'[\(*\)]' '{print $2;exit}'` + +gem install rubocop --version $rubocop_version +gem install rubocop-performance --version $rubocop_performance_version echo "Running Rubocop ..." -/usr/local/bundle/bin/rubocop +/usr/local/bundle/bin/rubocop --require rubocop-performance diff --git a/license_finder.gemspec b/license_finder.gemspec index 1c561ea32..d92dceb45 100644 --- a/license_finder.gemspec +++ b/license_finder.gemspec @@ -59,7 +59,8 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake' s.add_development_dependency 'rspec', '~> 3' s.add_development_dependency 'rspec-its' - s.add_development_dependency 'rubocop', '~> 0.67.2' + s.add_development_dependency 'rubocop', '~> 0.68.1' + s.add_development_dependency 'rubocop-performance', '~> 1.0.0' s.add_development_dependency 'webmock', '~> 3.5' # to preserve ruby < 2.2.2 support.