From 91b55af2b48f97fbd4521e7b70b4cebd5c548987 Mon Sep 17 00:00:00 2001
From: Georgi Kirichkov <kirichkov@users.noreply.github.com>
Date: Wed, 26 May 2021 14:20:25 +0300
Subject: [PATCH] Updates gemspec and required gems

- Replaces paperclip with kt-paperclip
- Removes dependency on codemirror-rails - no longer supported, see https://github.com/fixlr/codemirror-rails/issues/61
---
 comfortable_mexican_sofa.gemspec       | 9 ++++-----
 lib/comfortable_mexican_sofa/engine.rb | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/comfortable_mexican_sofa.gemspec b/comfortable_mexican_sofa.gemspec
index 33c1240c7..84313d8cc 100644
--- a/comfortable_mexican_sofa.gemspec
+++ b/comfortable_mexican_sofa.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors       = ["Oleg Khabarov"]
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
-  s.summary       = "Rails 4/5 CMS Engine"
+  s.summary       = "Rails 4/5/6 CMS Engine"
   s.description   = "ComfortableMexicanSofa is a powerful Rails 4/5 CMS Engine"
   s.license       = 'MIT'
 
@@ -17,20 +17,19 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.2.2'
+  s.required_ruby_version = '>= 2.5.0'
 
-  s.add_dependency 'rails',             '>= 5.2.0', '< 6'
+  s.add_dependency 'rails',             '>= 6.0.0', '< 6.1'
   s.add_dependency 'rails-i18n',        '>= 4.0.0'
   s.add_dependency 'bootstrap_form',    '>= 2.2.0', '< 3'
   s.add_dependency 'active_link_to',    '>= 1.0.0'
-  s.add_dependency 'paperclip',         '>= 4.0.0'
+  s.add_dependency 'kt-paperclip',      '>= 6.4.0'
   s.add_dependency 'kramdown',          '>= 1.0.0'
   s.add_dependency 'jquery-rails',      '>= 3.0.0'
   s.add_dependency 'jquery-ui-rails',   '>= 5.0.0'
   s.add_dependency 'haml-rails',        '>= 0.3.0'
   s.add_dependency 'sass-rails',        '>= 4.0.3'
   s.add_dependency 'coffee-rails',      '>= 3.1.0'
-  s.add_dependency 'codemirror-rails',  '>= 3.0.0'
   s.add_dependency 'bootstrap-sass',    '>= 3.2.0'
   s.add_dependency 'plupload-rails',    '>= 1.2.1'
 end
diff --git a/lib/comfortable_mexican_sofa/engine.rb b/lib/comfortable_mexican_sofa/engine.rb
index d1a46d1db..904cdb811 100644
--- a/lib/comfortable_mexican_sofa/engine.rb
+++ b/lib/comfortable_mexican_sofa/engine.rb
@@ -11,7 +11,6 @@
 require 'haml-rails'
 require 'sass-rails'
 require 'coffee-rails'
-require 'codemirror-rails'
 require 'bootstrap-sass'
 require 'plupload-rails'