diff --git a/Gemfile b/Gemfile index f14276f..421a1df 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'spree', github: 'spree/spree', branch: '2-3-stable' +gem 'spree', github: 'spree/spree', branch: '2-4-stable' # Provides basic authentication functionality for testing parts of your engine -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable' +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-4-stable' gem 'codeclimate-test-reporter', group: :test, require: nil diff --git a/Gemfile.lock b/Gemfile.lock index 2306e8a..6114996 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,33 +1,33 @@ GIT remote: git://github.com/spree/spree.git - revision: 01601c78a25af9d4e73a5bf8abdff55d13f7bf55 - branch: 2-3-stable + revision: f8f760cb0d1f46d6a2b8aac452b3d7689e0a15f0 + branch: 2-4-stable specs: - spree (2.3.10.beta) - spree_api (= 2.3.10.beta) - spree_backend (= 2.3.10.beta) - spree_cmd (= 2.3.10.beta) - spree_core (= 2.3.10.beta) - spree_frontend (= 2.3.10.beta) - spree_sample (= 2.3.10.beta) - spree_api (2.3.10.beta) + spree (2.4.7.beta) + spree_api (= 2.4.7.beta) + spree_backend (= 2.4.7.beta) + spree_cmd (= 2.4.7.beta) + spree_core (= 2.4.7.beta) + spree_frontend (= 2.4.7.beta) + spree_sample (= 2.4.7.beta) + spree_api (2.4.7.beta) rabl (~> 0.9.4.pre1) - spree_core (= 2.3.10.beta) + spree_core (= 2.4.7.beta) versioncake (~> 2.3.1) - spree_backend (2.3.10.beta) + spree_backend (2.4.7.beta) jquery-rails (~> 3.1.2) jquery-ui-rails (~> 5.0.0) select2-rails (= 3.5.9.1) - spree_api (= 2.3.10.beta) - spree_core (= 2.3.10.beta) - spree_cmd (2.3.10.beta) + spree_api (= 2.4.7.beta) + spree_core (= 2.4.7.beta) + spree_cmd (2.4.7.beta) thor (~> 0.14) - spree_core (2.3.10.beta) + spree_core (2.4.7.beta) activemerchant (~> 1.44.1) - acts_as_list (= 0.3.0) - awesome_nested_set (~> 3.0.0.rc.3) - aws-sdk (= 1.27.0) + acts_as_list (~> 0.3) + awesome_nested_set (~> 3.0.1) cancancan (~> 1.9.2) + carmen (~> 1.0.0) deface (~> 1.0.0) ffaker (~> 1.16) font-awesome-rails (~> 4.0) @@ -39,38 +39,39 @@ GIT monetize (~> 1.1) paperclip (~> 4.2.0) paranoia (~> 2.0.5) + premailer-rails rails (= 4.1.9) ransack (~> 1.4.1) state_machine (= 1.2.0) stringex (~> 1.5.1) truncate_html (= 0.9.2) - spree_frontend (2.3.10.beta) + twitter_cldr (~> 3.0) + spree_frontend (2.4.7.beta) canonical-rails (~> 0.0.4) jquery-rails (~> 3.1.2) - spree_api (= 2.3.10.beta) - spree_core (= 2.3.10.beta) - stringex (~> 1.5.1) - spree_sample (2.3.10.beta) - spree_core (= 2.3.10.beta) + spree_api (= 2.4.7.beta) + spree_core (= 2.4.7.beta) + spree_sample (2.4.7.beta) + spree_core (= 2.4.7.beta) GIT remote: git://github.com/spree/spree_auth_devise.git - revision: 0dfded4f74b3b05cdef6a4d0e47e277ef8baaad9 - branch: 2-3-stable + revision: 590d36810bbd35905ee204b4c9ea6f03ff236d09 + branch: 2-4-stable specs: spree_auth_devise (2.2.0) devise (~> 3.2.3) devise-encryptable (= 0.1.2) json multi_json - spree_core (~> 2.3.0) + spree_core (~> 2.4.0) PATH remote: . specs: - spree_waiting_list (2.3.4) + spree_waiting_list (2.4.0) haml (~> 4.0.6) - spree_core (~> 2.3.9) + spree_core (~> 2.4.6) GEM remote: https://rubygems.org/ @@ -112,17 +113,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts_as_list (0.3.0) + acts_as_list (0.6.0) activerecord (>= 3.0) + addressable (2.3.8) arel (5.0.1.20140414130214) awesome_nested_set (3.0.2) activerecord (>= 4.0.0, < 5) - aws-sdk (1.27.0) - json (~> 1.4) - nokogiri (>= 1.4.4) - uuidtools (~> 2.1) bcrypt (3.1.10) builder (3.2.2) + camertron-eprun (1.1.0) cancancan (1.9.2) canonical-rails (0.0.9) rails (>= 3.1, < 5.0) @@ -132,8 +131,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + carmen (1.0.2) + activesupport (>= 3.0.0) childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) + cldr-plurals-runtime-rb (1.0.0) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.7) @@ -148,6 +150,8 @@ GEM execjs coffee-script-source (1.9.1) colorize (0.7.5) + css_parser (1.3.6) + addressable database_cleaner (1.4.1) deface (1.0.1) colorize (>= 0.5.8) @@ -165,7 +169,7 @@ GEM diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) - execjs (2.5.0) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) ffaker (1.32.1) @@ -178,6 +182,7 @@ GEM tilt highline (1.6.21) hike (1.2.3) + htmlentities (4.3.3) httparty (0.13.3) json (~> 1.8) multi_xml (>= 0.5.2) @@ -223,6 +228,12 @@ GEM polyamorous (1.2.0) activerecord (>= 3.0) polyglot (0.3.5) + premailer (1.8.4) + css_parser (>= 1.3.6) + htmlentities (>= 4.0.0) + premailer-rails (1.8.0) + actionmailer (>= 3, < 5) + premailer (~> 1.7, >= 1.7.9) rabl (0.9.4.pre1) activesupport (>= 2.3.14) rack (1.5.2) @@ -302,9 +313,13 @@ GEM thread_safe (0.3.5) tilt (1.4.1) truncate_html (0.9.2) + twitter_cldr (3.1.2) + camertron-eprun + cldr-plurals-runtime-rb (~> 1.0.0) + json + tzinfo tzinfo (1.2.2) thread_safe (~> 0.1) - uuidtools (2.1.5) versioncake (2.3.1) actionpack (>= 3.2) activesupport (>= 3.2) diff --git a/spree_waiting_list.gemspec b/spree_waiting_list.gemspec index e4a0aec..4d4a730 100644 --- a/spree_waiting_list.gemspec +++ b/spree_waiting_list.gemspec @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_waiting_list' - s.version = '2.3.4' + s.version = '2.4.0' s.summary = 'Add a waiting list to your spree store' s.description = 'The waiting list allows users to signup to be notified via email when an items comes back into stock' s.required_ruby_version = '>= 1.9.3' @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.has_rdoc = false - s.add_dependency 'spree_core', '~> 2.3.9' + s.add_dependency 'spree_core', '~> 2.4.6' s.add_dependency 'haml', '~> 4.0.6' s.add_development_dependency 'capybara', '~> 2.4'