Merge branch 'master' into master

jmazzi · Mar 24, 2022 · d3f6941 · d3f6941
2 parents 53f720a + 518d82e
commit d3f6941
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Appraisals b/Appraisals
@@ -36,10 +36,7 @@ appraise "activerecord_6_1" do
 end
 
 appraise "activerecord_7_0" do
-
-  # We need this PR https://github.com/rails/rails/pull/43951 in order to support ruby 3.1
-  gem "activerecord",  github: "rails/rails", branch: "7-0-stable"
-  gem "activesupport",  github: "rails/rails", branch: "7-0-stable"
-
+  gem "activerecord",  "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
   gem "pg", "~> 1.1"
 end
diff --git a/crypt_keeper.gemspec b/crypt_keeper.gemspec
@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
 
   gem.post_install_message = "WARNING: CryptKeeper 2.0 contains breaking changes and may require you to reencrypt your data! Please view the README at https://github.com/jmazzi/crypt_keeper for more information."
 
-  gem.add_runtime_dependency 'activerecord',  '>= 4.2', '< 7.1'
-  gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 7.1'
+  gem.add_runtime_dependency 'activerecord',  '>= 4.2', '~> 7.0.0'
+  gem.add_runtime_dependency 'activesupport', '>= 4.2', '~> 7.0.0'
 
   gem.add_development_dependency 'rspec',       '~> 3.5.0'
   gem.add_development_dependency 'guard',       '~> 2.6.1'

diff --git a/gemfiles/activerecord_7_0.gemfile b/gemfiles/activerecord_7_0.gemfile
@@ -2,9 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", :github => "rails/rails", :branch => "7-0-stable"
-gem "activesupport", :github => "rails/rails", :branch => "7-0-stable"
-
+gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
 gem "pg", "~> 1.1"
 
 gemspec :path => "../"