Merge pull request #2311 from mamhoff/require-only-part-of-activemerc…

…hant Require only part of activemerchant
solidusio · Oct 31, 2017 · 6a296d5 · 6a296d5
2 parents 2916d72 + b3fb4c2
commit 6a296d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
@@ -1,5 +1,4 @@
 require 'rails/all'
-require 'active_merchant'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -53,6 +52,7 @@ class GatewayError < RuntimeError; end
 
 require 'spree/core/version'
 
+require 'spree/core/active_merchant_dependencies'
 require 'spree/core/class_constantizer'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'

diff --git a/core/lib/spree/core/active_merchant_dependencies.rb b/core/lib/spree/core/active_merchant_dependencies.rb
@@ -0,0 +1,11 @@
+require 'active_merchant/errors'
+
+require 'active_merchant/billing/base'
+
+require 'active_merchant/billing/avs_result'
+require 'active_merchant/billing/cvv_result'
+require 'active_merchant/billing/response'
+
+require 'active_merchant/billing/credit_card_methods'
+require 'active_merchant/billing/credit_card_formatting'
+require 'active_merchant/billing/credit_card'
diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     s.add_dependency rails_dep, '~> 5.1.0'
   end
 
-  s.add_dependency 'activemerchant', '~> 1.48'
+  s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
   s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'