Skip to content

Commit 6e6a144

Browse files
committed
Cap Aruba and ffi to resolve version conflicts
ffi has strict Ruby constraints aruba: Bundler could not find compatible versions for gem "thor": In Gemfile: aruba (~> 0.14.11) was resolved to 0.14.12, which depends on thor (~> 0.19) rails (~> 3.1.12) was resolved to 3.1.12, which depends on railties (= 3.1.12) was resolved to 3.1.12, which depends on thor (~> 0.14.6)
1 parent 0a3703e commit 6e6a144

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ end
3030

3131
if RUBY_VERSION < '1.9'
3232
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
33-
else
34-
gem 'ffi', '~> 1.9.25'
33+
elsif RUBY_VERSION < '2.0'
34+
gem 'ffi', '< 1.11.0' # ffi dropped Ruby 2.0 support in 1.11.0
35+
elsif RUBY_VERSION < '2.3'
36+
gem 'ffi', '< 1.13.0'
3537
end
3638

3739
if RUBY_VERSION >= '2.0.0'

rspec-rails.gemspec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ Gem::Specification.new do |s|
5151
end
5252

5353
s.add_development_dependency 'cucumber', '~> 1.3.5'
54-
s.add_development_dependency 'aruba', '~> 0.14.12'
54+
if ENV['RAILS_VERSION'].gsub(/[^\d\.-]/, '').tr('-', '.') < '4.0'
55+
# aruba > 0.9 depends on thor ~> 0.19, while railties < 4.0 depend on thor ~> 0.14.6
56+
s.add_development_dependency 'aruba', '~> 0.8.1'
57+
else
58+
s.add_development_dependency 'aruba', '~> 0.14.12'
59+
end
5560
s.add_development_dependency 'ammeter', '~> 1.1.2'
5661
end

0 commit comments

Comments
 (0)