From 3431f62a058a8579a3ace6905c43c441e82fdcb2 Mon Sep 17 00:00:00 2001
From: Santiago Bartesaghi <santiago.bartesaghi@rootstrap.com>
Date: Thu, 23 Dec 2021 10:41:46 -0300
Subject: [PATCH] Support Rails 7 and bump version (#77)

---
 .github/workflows/ci.yml                      | 22 +++++++++++++------
 lib/yaaf/version.rb                           |  2 +-
 ...{rails_5.2.0.gemfile => rails_5_2.gemfile} |  0
 ...{rails_6.0.0.gemfile => rails_6_0.gemfile} |  0
 ...{rails_6.1.0.gemfile => rails_6_1.gemfile} |  0
 spec/gemfiles/rails_7_0.gemfile               |  5 +++++
 yaaf.gemspec                                  |  4 ++--
 7 files changed, 23 insertions(+), 10 deletions(-)
 rename spec/gemfiles/{rails_5.2.0.gemfile => rails_5_2.gemfile} (100%)
 rename spec/gemfiles/{rails_6.0.0.gemfile => rails_6_0.gemfile} (100%)
 rename spec/gemfiles/{rails_6.1.0.gemfile => rails_6_1.gemfile} (100%)
 create mode 100644 spec/gemfiles/rails_7_0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dfd7dbe..1543940 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [rails_5.2.0.gemfile, rails_6.0.0.gemfile, rails_6.1.0.gemfile, rails_main.gemfile]
+        gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_main.gemfile]
         ruby_version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
         exclude:
           - gemfile: rails_main.gemfile
@@ -19,17 +19,25 @@ jobs:
             ruby_version: 2.5
           - gemfile: rails_main.gemfile
             ruby_version: 2.6
-          - gemfile: rails_6.0.0.gemfile
+          - gemfile: rails_7_0.gemfile
             ruby_version: 2.3
-          - gemfile: rails_6.0.0.gemfile
+          - gemfile: rails_7_0.gemfile
             ruby_version: 2.4
-          - gemfile: rails_6.1.0.gemfile
+          - gemfile: rails_7_0.gemfile
+            ruby_version: 2.5
+          - gemfile: rails_7_0.gemfile
+            ruby_version: 2.6
+          - gemfile: rails_6_1.gemfile
+            ruby_version: 2.3
+          - gemfile: rails_6_1.gemfile
+            ruby_version: 2.4
+          - gemfile: rails_6_0.gemfile
             ruby_version: 2.3
-          - gemfile: rails_6.1.0.gemfile
+          - gemfile: rails_6_0.gemfile
             ruby_version: 2.4
-          - gemfile: rails_5.2.0.gemfile
+          - gemfile: rails_6_0.gemfile
             ruby_version: 3.0
-          - gemfile: rails_6.0.0.gemfile
+          - gemfile: rails_5_2.gemfile
             ruby_version: 3.0
     env:
       BUNDLE_GEMFILE: spec/gemfiles/${{ matrix.gemfile }}
diff --git a/lib/yaaf/version.rb b/lib/yaaf/version.rb
index 753217a..3a47b4d 100644
--- a/lib/yaaf/version.rb
+++ b/lib/yaaf/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YAAF
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end
diff --git a/spec/gemfiles/rails_5.2.0.gemfile b/spec/gemfiles/rails_5_2.gemfile
similarity index 100%
rename from spec/gemfiles/rails_5.2.0.gemfile
rename to spec/gemfiles/rails_5_2.gemfile
diff --git a/spec/gemfiles/rails_6.0.0.gemfile b/spec/gemfiles/rails_6_0.gemfile
similarity index 100%
rename from spec/gemfiles/rails_6.0.0.gemfile
rename to spec/gemfiles/rails_6_0.gemfile
diff --git a/spec/gemfiles/rails_6.1.0.gemfile b/spec/gemfiles/rails_6_1.gemfile
similarity index 100%
rename from spec/gemfiles/rails_6.1.0.gemfile
rename to spec/gemfiles/rails_6_1.gemfile
diff --git a/spec/gemfiles/rails_7_0.gemfile b/spec/gemfiles/rails_7_0.gemfile
new file mode 100644
index 0000000..4c52ee9
--- /dev/null
+++ b/spec/gemfiles/rails_7_0.gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../..'
+
+gem 'rails', '~> 7.0.0'
diff --git a/yaaf.gemspec b/yaaf.gemspec
index 1d6c2f6..70d1449 100644
--- a/yaaf.gemspec
+++ b/yaaf.gemspec
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir['LICENSE.txt', 'README.md', 'lib/**/*']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel', ['>= 5.2', '< 7']
-  spec.add_dependency 'activerecord', ['>= 5.2', '< 7']
+  spec.add_dependency 'activemodel', '>= 5.2'
+  spec.add_dependency 'activerecord', '>= 5.2'
 
   spec.add_development_dependency 'database_cleaner-active_record', '~> 1.8.0'
   spec.add_development_dependency 'rake', '~> 13.0.1'