From 1f496c6ca6062163d404b33e16422f8bdf6d8eea Mon Sep 17 00:00:00 2001 From: Dmitriy Strukov Date: Thu, 8 Mar 2018 13:16:13 +0300 Subject: [PATCH] Update spree to 3.4.0 --- Gemfile | 16 +++++++++++----- spree_price_books.gemspec | 9 ++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index fd262f2..8904701 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,15 @@ source 'https://rubygems.org' -spree_branch = '3-4-stable' -gem 'spree', github: 'spree/spree', branch: spree_branch -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_branch -gem 'spree_multi_currency', github: 'spree/spree_multi_currency', branch: spree_branch -gem 'spree_multi_domain', github: 'spree/spree-multi-domain', branch: spree_branch +# spree_branch = '3-4-stable' +# gem 'spree', github: 'spree/spree', branch: spree_branch +# gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_branch +# gem 'spree_multi_currency', github: 'spree/spree_multi_currency', branch: spree_branch +# gem 'spree_multi_domain', github: 'spree/spree-multi-domain', branch: spree_branch + +gem 'spree', '~> 3.4.0' + +gem 'spree_auth_devise' +gem 'spree_multi_currency' +gem 'spree_multi_domain' gemspec diff --git a/spree_price_books.gemspec b/spree_price_books.gemspec index 9300124..09eb03f 100644 --- a/spree_price_books.gemspec +++ b/spree_price_books.gemspec @@ -25,11 +25,14 @@ Gem::Specification.new do |s| s.add_development_dependency 'database_cleaner' s.add_development_dependency 'factory_girl', '~> 4.4' s.add_development_dependency 'ffaker' + s.add_development_dependency 'pg' - s.add_development_dependency 'rspec-rails', '~> 2.13' - s.add_development_dependency 'sass-rails', '~> 4.0.2' + s.add_development_dependency 'sqlite3' + + s.add_development_dependency 'rspec-rails' + s.add_development_dependency 'sass-rails' + s.add_development_dependency 'selenium-webdriver' s.add_development_dependency 'simplecov' - s.add_development_dependency 'sqlite3' s.add_development_dependency 'timecop' end