Merge branch 'core' into circular-dependent-destroy

.travis.yml

@@ -4,25 +4,36 @@ before_install: gem update --system
 cache: bundler
 rvm:
   - 2.2
-  - 2.3.5
-  - 2.4.3
-  - 2.5.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.3
   - jruby-9.1.6.0
 
 env:
   matrix:
-    - RAILS='~> 4.2.0'
-    - RAILS='~> 5.0.0'
+    - RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
+    - RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
     - RAILS='~> 5.1.0'
     - RAILS='~> 5.2.0'
+    - RAILS='master'
 
 matrix:
   allow_failures:
-    - env: RAILS='~> 4.2.0'
+    - env: RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
       rvm: jruby-9.1.6.0
-    - env: RAILS='~> 5.0.0'
+    - env: RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
       rvm: jruby-9.1.6.0
     - env: RAILS='~> 5.1.0'
       rvm: jruby-9.1.6.0
     - env: RAILS='~> 5.2.0'
       rvm: jruby-9.1.6.0
+    - env: RAILS='master'
+      rvm: jruby-9.1.6.0
+  exclude:
+    - rvm: 2.2
+      env: RAILS='master'
+    - rvm: 2.3.8
+      env: RAILS='master'
+    - rvm: 2.4.5
+      env: RAILS='master'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # paranoia Changelog
 
+## 2.4.2
+
+* [#470](https://github.com/rubysherpas/paranoia/pull/470) Add support for ActiveRecord 6.0
+
+  [Anton Kolodii](https://github.com/iggant), [Jared Norman](https://github.com/jarednorman)
+
 ## 2.4.1
 
 * [#435](https://github.com/rubysherpas/paranoia/pull/435) Monkeypatch activerecord relations to work with rails 5.2.0

Gemfile

@@ -1,20 +1,30 @@
 source 'https://rubygems.org'
 
-gem 'sqlite3', platforms: [:ruby]
+sqlite = ENV['SQLITE_VERSION']
+
+if sqlite
+  gem 'sqlite3', sqlite, platforms: [:ruby]
+else
+  gem 'sqlite3', platforms: [:ruby]
+end
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
 platforms :rbx do
+  gem 'rubinius-developer_tools'
   gem 'rubysl', '~> 2.0'
   gem 'rubysl-test-unit'
-  gem 'rubinius-developer_tools'
 end
 
 rails = ENV['RAILS'] || '~> 5.2.0'
 
-gem 'rails', rails
+if rails == 'master'
+  gem 'rails', github: 'rails/rails'
+else
+  gem 'rails', rails
+end
 
 # Specify your gem's dependencies in paranoia.gemspec
 gemspec

lib/paranoia.rb

@@ -1,5 +1,4 @@
 require 'active_record' unless defined? ActiveRecord
-
 require 'paranoia/active_record_5_2'
 
 module Paranoia

lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.4.2'.freeze
 end

paranoia.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'activerecord', '>= 4.0', '< 5.3'
+  s.add_dependency 'activerecord', '>= 4.0', '< 6.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"