Skip to content

Commit c927e91

Browse files
DavidSsebastian-miclea
authored andcommitted
(maint) pin rubocop dependencies to work on ruby 2.1
1 parent 912c220 commit c927e91

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ group :tests do
1515
gem 'rubocop-rspec'
1616
# rubocop 0.58 throws when testing against ruby 2.1, so pin to the latest,
1717
# unless we're dealing with jruby...
18-
if RUBY_PLATFORM == 'java'
19-
gem 'rubocop'
20-
else
18+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
2119
gem 'rubocop', '0.57.2'
20+
gem 'parallel', '1.13.0'
21+
else
22+
# 2.1-compatible analysis was dropped after version 0.58
23+
# This needs to be removed once we drop puppet4 support.
24+
gem 'rubocop', '~> 0.57.0'
2225
end
2326
gem 'simplecov-console'
2427
# the test gems required for module testing

lib/puppet/resource_api/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Puppet
22
module ResourceApi
3-
VERSION = '1.6.5'.freeze
3+
VERSION = '1.6.4'.freeze
44
end
55
end

0 commit comments

Comments
 (0)