From 265e5da478d62b7885458b8f9457ce3a7d86d97a Mon Sep 17 00:00:00 2001 From: Eugene Kenny Date: Mon, 30 Nov 2020 14:32:57 +0000 Subject: [PATCH] Relax Kaminari dependency to allow 1.x versions Kaminari 1.0 was released almost four years ago, but applications using this gem currently can't upgrade past 0.17.0. There was only one change necessary for compatibility with 1.0: the `Kaminari::Hooks` constant no longer exists, as the adapter configuration it used to perform now happens automatically. --- lib/restpack_serializer.rb | 2 +- restpack_serializer.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/restpack_serializer.rb b/lib/restpack_serializer.rb index 524d3bf..aec607d 100644 --- a/lib/restpack_serializer.rb +++ b/lib/restpack_serializer.rb @@ -6,7 +6,7 @@ require_relative 'restpack_serializer/factory' require_relative 'restpack_serializer/result' -Kaminari::Hooks.init +Kaminari::Hooks.init if defined?(Kaminari::Hooks) module RestPack module Serializer diff --git a/restpack_serializer.gemspec b/restpack_serializer.gemspec index 5d5d4c4..f219fee 100644 --- a/restpack_serializer.gemspec +++ b/restpack_serializer.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'activesupport', ['>= 4.0.3', '< 6.1'] gem.add_dependency 'activerecord', ['>= 4.0.3', '< 6.1'] - gem.add_dependency 'kaminari', '~> 0.17.0' + gem.add_dependency 'kaminari', ['>= 0.17.0', '< 2.0'] gem.add_development_dependency 'restpack_gem', '~> 0.0.9' gem.add_development_dependency 'rake', '~> 11.3'