From a1b4686c36914649fb63915afa5940dcbaad1c8c Mon Sep 17 00:00:00 2001 From: Tom Gilligan <tom@gilligan.net> Date: Tue, 13 Aug 2019 21:28:53 +1000 Subject: [PATCH 1/2] Constrain sqlite3 gem versions for rails 4.2, 5.0 --- gemfiles/activerecord_4.2.gemfile | 2 +- gemfiles/activerecord_5.0.gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile index ba3a7fd9..8b9c2b75 100644 --- a/gemfiles/activerecord_4.2.gemfile +++ b/gemfiles/activerecord_4.2.gemfile @@ -7,7 +7,7 @@ gem "activerecord", "~> 4.2.0" platforms :ruby do gem "mysql2", "< 0.5" gem "pg", "~> 0.21" - gem "sqlite3" + gem "sqlite3", "~> 1.3", "< 1.4" end platforms :jruby do diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile index 933e74d7..83adaeb4 100644 --- a/gemfiles/activerecord_5.0.gemfile +++ b/gemfiles/activerecord_5.0.gemfile @@ -7,7 +7,7 @@ gem "activerecord", "~> 5.0.0" platforms :ruby do gem "mysql2" gem "pg" - gem "sqlite3" + gem "sqlite3", "~> 1.3", "< 1.4" end platforms :jruby do From 9497c4bbd22075564aeb903882ffb80574fdbd31 Mon Sep 17 00:00:00 2001 From: Tom Gilligan <tom@gilligan.net> Date: Mon, 8 Jul 2019 18:47:41 +1000 Subject: [PATCH 2/2] Directly require core_ext for String#strip_heredoc This is needed for Rails 6+ as this core_ext is no longer indirectly loaded. --- lib/closure_tree.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/closure_tree.rb b/lib/closure_tree.rb index fb03939c..bcb98261 100644 --- a/lib/closure_tree.rb +++ b/lib/closure_tree.rb @@ -1,4 +1,5 @@ require 'active_record' +require 'active_support/core_ext/string/strip' module ClosureTree extend ActiveSupport::Autoload