Merge pull request #6445 from blish/core-remove-kaminari

Remove kaminari-activerecord from solidus_core

Author: tvdeyen

api/lib/spree/api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "kaminari/activerecord"
 require "spree/core"
 
 require "spree/api/engine"

core/lib/spree/core.rb

@@ -16,7 +16,6 @@
 require "awesome_nested_set"
 require "cancan"
 require "friendly_id"
-require "kaminari/activerecord"
 require "monetize"
 require "paperclip"
 require "ransack"

core/lib/spree/core/search/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "kaminari/activerecord"
+
 module Spree
   module Core
     module Search

core/solidus_core.gemspec

@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
   s.add_dependency "discard", "~> 1.0"
   s.add_dependency "friendly_id", "~> 5.0"
   s.add_dependency "image_processing", "~> 1.10"
-  s.add_dependency "kaminari-activerecord", "~> 1.1"
   s.add_dependency "mini_magick", "~> 4.10"
   s.add_dependency "monetize", "~> 1.8"
   s.add_dependency "kt-paperclip", [">= 6.3", "< 8"]