From 4ff0bf816261c8c19e67e551af385f62fc391b5c Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Wed, 10 Apr 2019 13:18:51 +0100 Subject: [PATCH] Change gemfile to depend on the different spree gems, not spree as a whole --- Gemfile | 6 +++++- Gemfile.lock | 15 +++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 455e13bf39..9205250a12 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,11 @@ gem 'pg' # OFN-maintained and patched version of Spree v2.0.4. See # https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade # for details. -gem 'spree', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_api', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_backend', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_frontend', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_sample', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable' gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable' diff --git a/Gemfile.lock b/Gemfile.lock index 79a51cd89f..42889f9e3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,13 +34,6 @@ GIT revision: 46d6f8f5fd434105b0c69958276d1727a3066a97 branch: 2-0-4-stable specs: - spree (2.0.4) - spree_api (= 2.0.4) - spree_backend (= 2.0.4) - spree_cmd (= 2.0.4) - spree_core (= 2.0.4) - spree_frontend (= 2.0.4) - spree_sample (= 2.0.4) spree_api (2.0.4) rabl (= 0.8.4) spree_core (= 2.0.4) @@ -53,8 +46,6 @@ GIT select2-rails (~> 3.4.7) spree_api (= 2.0.4) spree_core (= 2.0.4) - spree_cmd (2.0.4) - thor (>= 0.14.6) spree_core (2.0.4) activemerchant (~> 1.34) acts_as_list (= 0.2.0) @@ -871,10 +862,14 @@ DEPENDENCIES simplecov skylight (< 2.0) spinjs-rails - spree! + spree_api! spree_auth_devise! + spree_backend! + spree_core! + spree_frontend! spree_i18n! spree_paypal_express! + spree_sample! spring (= 1.7.2) spring-commands-rspec stripe