From f167583cf0b1e009833cf1981b6afed06f4fd720 Mon Sep 17 00:00:00 2001
From: Joshua Bryant <>
Date: Sun, 18 Aug 2019 19:42:30 +0100
Subject: [PATCH 1/3] Remove constraints on gems to work with 6.0.0

---
 acts_as_paranoid.gemspec          | 4 ++--
 gemfiles/active_record_60.gemfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acts_as_paranoid.gemspec b/acts_as_paranoid.gemspec
index 72a10c3b..31e29283 100644
--- a/acts_as_paranoid.gemspec
+++ b/acts_as_paranoid.gemspec
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir["test/*.rb"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.2", "< 6.0"
-  spec.add_dependency "activesupport", ">= 4.2", "< 6.0"
+  spec.add_dependency "activerecord", ">= 4.2", "< 6.1"
+  spec.add_dependency "activesupport", ">= 4.2", "< 6.1"
 
   spec.add_development_dependency "bundler", ">= 1.5", "< 3.0"
   spec.add_development_dependency "rake"
diff --git a/gemfiles/active_record_60.gemfile b/gemfiles/active_record_60.gemfile
index 2a1c9a46..6d7bf21f 100644
--- a/gemfiles/active_record_60.gemfile
+++ b/gemfiles/active_record_60.gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '6.0.0.rc2', require: 'active_record'
-gem 'activesupport', '6.0.0.rc2', require: 'active_support'
+gem 'activerecord', '6.0.0', require: 'active_record'
+gem 'activesupport', '6.0.0', require: 'active_support'
 
 # Development dependencies
 group :development do

From 3230adb4c875a8f063e5aa6a7cfb2a966fdbf952 Mon Sep 17 00:00:00 2001
From: Joshua Bryant <>
Date: Mon, 19 Aug 2019 16:14:00 +0100
Subject: [PATCH 2/3] Better comparison of gems

---
 test/test_associations.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_associations.rb b/test/test_associations.rb
index 95d3e746..c5983e62 100644
--- a/test/test_associations.rb
+++ b/test/test_associations.rb
@@ -228,7 +228,7 @@ def test_double_belongs_to_with_deleted
   end
 
   def test_mass_assignment_of_paranoid_column_enabled
-    if ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1
+    if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('5.2.0')
       skip 'Creation as deleted is not supported with Rails >= 5.2'
     end
     now = Time.now

From 3845921995fc78d79c0b6f1451f7736be860ca4e Mon Sep 17 00:00:00 2001
From: Joshua Bryant <>
Date: Mon, 19 Aug 2019 17:44:33 +0100
Subject: [PATCH 3/3] Open to 7.0

---
 acts_as_paranoid.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/acts_as_paranoid.gemspec b/acts_as_paranoid.gemspec
index 31e29283..b61aec1e 100644
--- a/acts_as_paranoid.gemspec
+++ b/acts_as_paranoid.gemspec
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = Dir["test/*.rb"]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.2", "< 6.1"
-  spec.add_dependency "activesupport", ">= 4.2", "< 6.1"
+  spec.add_dependency "activerecord", ">= 4.2", "< 7.0"
+  spec.add_dependency "activesupport", ">= 4.2", "< 7.0"
 
   spec.add_development_dependency "bundler", ">= 1.5", "< 3.0"
   spec.add_development_dependency "rake"