diff options
author | Brendan Deere <brendan.g.deere@gmail.com> | 2017-05-23 02:01:02 -0700 |
---|---|---|
committer | Brendan Deere <brendan.g.deere@gmail.com> | 2017-05-23 02:01:02 -0700 |
commit | 8701cace0825f2cd798d08340c474efa757a320a (patch) | |
tree | 3e9e428b2b993810cfdf7ad63a21c39f4e90e0d3 /solidus_subscriptions.gemspec | |
parent | da0931d79388d4676518fd268ac801848b4bc7d1 (diff) |
Fix dependency conflicts
Rspec was resolving to 3.5.0, and rspec-rails was previously locking the
version to 3.4.x.
This fixes them
Diffstat (limited to 'solidus_subscriptions.gemspec')
-rw-r--r-- | solidus_subscriptions.gemspec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solidus_subscriptions.gemspec b/solidus_subscriptions.gemspec index ee51079..3edf6c4 100644 --- a/solidus_subscriptions.gemspec +++ b/solidus_subscriptions.gemspec @@ -22,21 +22,21 @@ Gem::Specification.new do |s| s.add_dependency 'i18n' s.add_development_dependency 'capybara' - s.add_development_dependency 'poltergeist' s.add_development_dependency 'coffee-rails' - s.add_development_dependency 'sass-rails' s.add_development_dependency 'database_cleaner' s.add_development_dependency 'factory_girl' + s.add_development_dependency 'poltergeist' + s.add_development_dependency 'pry' + s.add_development_dependency 'rspec','~> 3.4' + s.add_development_dependency 'rspec-activemodel-mocks' s.add_development_dependency 'rspec-rails' s.add_development_dependency 'rubocop', '0.37.2' s.add_development_dependency 'rubocop-rspec', '1.4.0' + s.add_development_dependency 'sass-rails' + s.add_development_dependency 'shoulda-matchers', '~> 3.1' s.add_development_dependency 'simplecov' s.add_development_dependency 'sqlite3' s.add_development_dependency 'timecop' - s.add_development_dependency 'pry' - s.add_development_dependency 'shoulda-matchers', '~> 3.1' - s.add_development_dependency 'rspec' - s.add_development_dependency 'rspec-activemodel-mocks' s.add_development_dependency 'versioncake' s.add_development_dependency 'yard' end |