rebase conflict resolved

paranoia.gemspec

@@ -1,40 +1,37 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/paranoia/version", __FILE__)
+# stub: paranoia 2.1.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name        = "paranoia"
-  s.version     = Paranoia::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = %w(radarlistener@gmail.com)
-  s.email       = %w(ben@benmorgan.io john.hawthorn@gmail.com)
-  s.homepage    = "https://github.com/rubysherpas/paranoia"
-  s.license     = 'MIT'
-  s.summary     = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5, using much, much, much less code."
-  s.description = <<-DSC
-    Paranoia is a re-implementation of acts_as_paranoid for Rails 5, 6, and 7,
-    using much, much, much less code. You would use either plugin / gem if you
-    wished that when you called destroy on an Active Record object that it
-    didn't actually destroy it, but just "hid" the record. Paranoia does this
-    by setting a deleted_at field to the current time when you destroy a record,
-    and hides it by scoping all queries on your model to only include records
-    which do not have a deleted_at field.
-  DSC
-
-  s.required_rubygems_version = ">= 1.3.6"
-
-  s.required_ruby_version = '>= 2.5'
-
-  s.add_dependency 'activerecord', '>= 5.1', '< 7.2'
-
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rake"
-
-
-  s.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)})  }
-    files
+  s.name = "paranoia".freeze
+  s.version = "2.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["radarlistener@gmail.com".freeze]
+  s.date = "2017-10-13"
+  s.description = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code. You would use either plugin / gem if you wished that when you called destroy on an Active Record object that it didn't actually destroy it, but just \"hid\" the record. Paranoia does this by setting a deleted_at field to the current time when you destroy a record, and hides it by scoping all queries on your model to only include records which do not have a deleted_at field.".freeze
+  s.email = []
+  s.files = [".gitignore".freeze, ".travis.yml".freeze, "CHANGELOG.md".freeze, "CONTRIBUTING.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "lib/paranoia.rb".freeze, "lib/paranoia/rspec.rb".freeze, "lib/paranoia/version.rb".freeze, "paranoia.gemspec".freeze, "test/paranoia_test.rb".freeze]
+  s.homepage = "http://rubygems.org/gems/paranoia".freeze
+  s.rubyforge_project = "paranoia".freeze
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much, much, much less code.".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>.freeze, ["~> 4.0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>.freeze, ["~> 4.0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>.freeze, ["~> 4.0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.0.0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
   end
-
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
 end