From bad2e1c6921e74a9af24dc65dc90171014ba86de Mon Sep 17 00:00:00 2001 From: Joe <6955350+joebutler2@users.noreply.github.com> Date: Thu, 3 Oct 2019 12:52:42 -0400 Subject: [PATCH 1/3] Update dependencies in order to support Rails 6. --- refinerycms-blog.gemspec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 177f2e8c..09a20a39 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-blog} - s.version = %q{4.0.0} + s.version = %q{4.0.1} s.description = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with Refinery CMS.} s.summary = %q{Ruby on Rails blogging engine for Refinery CMS.} s.email = %q{info@refinerycms.com} @@ -15,14 +15,14 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- spec/*`.split("\n") # Runtime dependencies - s.add_dependency 'refinerycms-core', '~> 4.0' - s.add_dependency 'refinerycms-settings', '~> 4.0' + s.add_dependency 'refinerycms-core', '>= 4.0', '< 5' + s.add_dependency 'refinerycms-settings', '>= 4.0', '< 5' s.add_dependency 'filters_spam', '~> 0.2' - s.add_dependency 'acts-as-taggable-on' + s.add_dependency 'acts-as-taggable-on', '~> 6' s.add_dependency 'seo_meta', ['>=3.0.0', '~>3.0'] s.add_dependency 'rails_autolink', '~> 1.1.3' s.add_dependency 'friendly_id', ['< 5.3', '>= 5.1.0'] - s.add_dependency 'globalize', '~> 5.1.0' + s.add_dependency 'globalize', '~> 5.3.0' s.add_dependency 'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1' - s.add_dependency 'responders', '~> 2.0' + s.add_dependency 'responders', '~> 3.0' end From d1cbcfa7861b7985c11fa9e6a0aed32af9d10959 Mon Sep 17 00:00:00 2001 From: Joe <6955350+joebutler2@users.noreply.github.com> Date: Thu, 3 Oct 2019 13:07:33 -0400 Subject: [PATCH 2/3] Mirror the ruby versions that are support in RefineryCMS. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcac9157..bf1d476d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ notifications: webhooks: - https://webhooks.gitter.im/e/b5d48907cdc89864b874 rvm: - - 2.3.1 - - 2.2 + - 2.6.1 + - 2.5.3 + - 2.4.5 sudo: false From 6065a48d1818d06fe5b8950ae9be0bd28eed4522 Mon Sep 17 00:00:00 2001 From: Joe <6955350+joebutler2@users.noreply.github.com> Date: Thu, 3 Oct 2019 13:42:37 -0400 Subject: [PATCH 3/3] Update travis config to fix CI. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bf1d476d..2a8b010b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty language: ruby cache: bundler bundler_args: --without development