From 6cfc4f88caa8e14a9c36dca76947bdb47de1728c Mon Sep 17 00:00:00 2001
From: Dmitry Rybakov <dmitry.rybakov@mongodb.com>
Date: Fri, 6 Oct 2023 12:47:32 +0200
Subject: [PATCH] MONGOID-5689 Add Rails 7.1 support

---
 .evergreen/config.yml              | 4 ++--
 .evergreen/config/variants.yml.erb | 4 ++--
 mongoid.gemspec                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 70e4ae92e6..815ffb5c31 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -744,7 +744,7 @@ buildvariants:
     driver: ["current"]
     mongodb-version: "6.0"
     topology: "standalone"
-    rails: ['7.0']
+    rails: ['7.0', '7.1']
     os: ubuntu-22.04
     fle: helper
   display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
@@ -830,7 +830,7 @@ buildvariants:
     mongodb-version: '6.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.0', '6.1', '7.0']
+    rails: ['6.0', '6.1', '7.0', '7.1']
     os: rhel80
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
index 9348e6b05b..78cfa7a66e 100644
--- a/.evergreen/config/variants.yml.erb
+++ b/.evergreen/config/variants.yml.erb
@@ -115,7 +115,7 @@ buildvariants:
     driver: ["current"]
     mongodb-version: "6.0"
     topology: "standalone"
-    rails: ['7.0']
+    rails: ['7.0', '7.1']
     os: ubuntu-22.04
     fle: helper
   display_name: "${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
@@ -201,7 +201,7 @@ buildvariants:
     mongodb-version: '6.0'
     topology: standalone
     app-tests: yes
-    rails: ['6.0', '6.1', '7.0']
+    rails: ['6.0', '6.1', '7.0', '7.1']
     os: rhel80
   display_name: "app tests ${driver}, ${ruby}, ${rails}"
   tasks:
diff --git a/mongoid.gemspec b/mongoid.gemspec
index 4444859fb2..0a12d74ecb 100644
--- a/mongoid.gemspec
+++ b/mongoid.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   # Ruby 3.0 requires ActiveModel 6.0 or higher.
   # activemodel 7.0.0 cannot be used due to Class#descendants issue
   # See: https://github.com/rails/rails/pull/43951
-  s.add_dependency("activemodel", ['>=5.1', '<7.1', '!= 7.0.0'])
+  s.add_dependency("activemodel", ['>=5.1', '<7.2', '!= 7.0.0'])
   s.add_dependency("mongo", ['>=2.18.0', '<3.0.0'])
   s.add_dependency("concurrent-ruby", ['>= 1.0.5', '< 2.0'])