Skip to content

Commit aa4cd3b

Browse files
authored
Merge pull request #99 from ashoda/rails_5_dependencies
Fix support for rails 5 without breaking previous ruby version support
2 parents 255b93e + 5b544c3 commit aa4cd3b

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

apivore.gemspec

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
22

33
Gem::Specification.new do |s|
44
s.name = 'apivore'
5-
s.version = '1.6.0'
5+
s.version = '1.6.1'
66
s.date = '2016-02-24'
77
s.summary = "Tests your API against its OpenAPI (Swagger) 2.0 spec"
88
s.description = "Tests your rails API using its OpenAPI (Swagger) description of end-points, models, and query parameters."
@@ -18,13 +18,21 @@ Gem::Specification.new do |s|
1818
s.add_runtime_dependency 'rspec', '~> 3'
1919
s.add_runtime_dependency 'rspec-expectations', '~> 3.1'
2020
s.add_runtime_dependency 'rspec-mocks', '~> 3.1'
21-
s.add_runtime_dependency 'actionpack', '>= 4', '< 6'
2221
s.add_runtime_dependency 'hashie', '~> 3.3'
2322
s.add_development_dependency 'pry', '~> 0'
2423
s.add_development_dependency 'rake', '~> 10.3'
2524
s.add_development_dependency 'rspec-rails', '~> 3'
2625
s.add_development_dependency 'activesupport', '>= 4', '< 6'
2726

27+
# Rails 5 stopped support for ruby < 2.2.2
28+
# Hack to support currently suported ruby versions
29+
# TODO: remove and explicitly require ruby 2.2.2 as min version in version 2 of apivore
30+
if RUBY_VERSION >= '2.2.2'
31+
s.add_runtime_dependency 'actionpack', '>= 4', '< 6'
32+
else
33+
s.add_runtime_dependency 'actionpack', '< 5'
34+
end
35+
2836
if RUBY_VERSION >= '2.2.0'
2937
s.add_development_dependency 'test-unit', '~> 3'
3038
end

0 commit comments

Comments
 (0)