Skip to content

Commit e7a8184

Browse files
authored
Merge pull request #164 from sebastian-miclea/1.6.x
(MAINT) Bump version
2 parents 64c97c4 + 15733c6 commit e7a8184

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Gemfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,21 @@ group :tests do
1212
gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
1313
gem 'rake', '~> 10.0'
1414
gem 'rspec', '~> 3.0'
15-
gem 'rubocop-rspec'
1615
# rubocop 0.58 throws when testing against ruby 2.1, so pin to the latest,
1716
# unless we're dealing with jruby...
1817
if RUBY_PLATFORM == 'java'
18+
# load any rubocop version that works on java for the Rakefile
1919
gem 'rubocop'
20-
else
20+
elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
2121
gem 'rubocop', '0.57.2'
22+
# the last version of parallel to support ruby 2.1
23+
gem 'parallel', '1.13.0'
24+
gem 'rubocop-rspec'
25+
else
26+
# 2.1-compatible analysis was dropped after version 0.58
27+
# This needs to be removed once we drop puppet4 support.
28+
gem 'rubocop', '~> 0.57.0'
29+
gem 'rubocop-rspec'
2230
end
2331
gem 'simplecov-console'
2432
# 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.3'.freeze
3+
VERSION = '1.6.4'.freeze
44
end
55
end

0 commit comments

Comments
 (0)