From 9a76a4ed5de15f5668a2cd8c85efc58e99520b33 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Tue, 10 Oct 2023 18:54:57 -0300
Subject: [PATCH] Test with Rails 7.1 by default, create new Gemfile for 7.0

---
 .github/workflows/test.yml |  5 +++
 Gemfile                    |  6 +--
 Gemfile.lock               | 83 ++++++++++++++++++++++++++------------
 gemfiles/Gemfile-rails-7-0 |  9 +++++
 4 files changed, 74 insertions(+), 29 deletions(-)
 create mode 100644 gemfiles/Gemfile-rails-7-0

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9da04ce..7554bf8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,6 +8,7 @@ jobs:
         gemfile:
           - Gemfile
           - gemfiles/Gemfile-rails-main
+          - gemfiles/Gemfile-rails-7-0
           - gemfiles/Gemfile-rails-6-1
           - gemfiles/Gemfile-rails-6-0
           - gemfiles/Gemfile-rails-5-2
@@ -27,6 +28,10 @@ jobs:
             ruby: '2.6'
           - gemfile: gemfiles/Gemfile-rails-main
             ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.5'
           - gemfile: gemfiles/Gemfile-rails-6-0
             ruby: '3.2'
           - gemfile: gemfiles/Gemfile-rails-6-0
diff --git a/Gemfile b/Gemfile
index eac9a4dd..b0618c13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'country_select'
-gem 'activemodel', '~> 7.0.0'
-gem 'actionpack', '~> 7.0.0'
-gem 'railties', '~> 7.0.0'
+gem 'activemodel', '~> 7.1.0'
+gem 'actionpack', '~> 7.1.0'
+gem 'railties', '~> 7.1.0'
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index cea876ec..36272c7d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,49 +8,72 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (7.1.0)
+      actionview (= 7.1.0)
+      activesupport (= 7.1.0)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.0)
+      activesupport (= 7.1.0)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activesupport (7.0.8)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.1.0)
+      activesupport (= 7.1.0)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     countries (5.7.0)
       unaccent (~> 0.3)
     country_select (8.0.3)
       countries (~> 5.0)
     crass (1.0.6)
+    drb (2.1.1)
+      ruby2_keywords
     erubi (1.12.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
     loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    method_source (1.0.0)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
+    mutex_m (0.1.2)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    psych (5.1.0)
+      stringio
     racc (1.7.1)
-    rack (2.2.8)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -58,30 +81,38 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
-      method_source
+    railties (7.1.0)
+      actionpack (= 7.1.0)
+      activesupport (= 7.1.0)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rake (13.0.6)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    reline (0.3.9)
+      io-console (~> 0.5)
+    ruby2_keywords (0.0.5)
+    stringio (3.0.8)
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
+    webrick (1.8.1)
     zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 7.0.0)
-  activemodel (~> 7.0.0)
+  actionpack (~> 7.1.0)
+  activemodel (~> 7.1.0)
   country_select
-  railties (~> 7.0.0)
+  railties (~> 7.1.0)
   rake
   simple_form!
 
 BUNDLED WITH
-   2.4.5
+   2.4.20
diff --git a/gemfiles/Gemfile-rails-7-0 b/gemfiles/Gemfile-rails-7-0
new file mode 100644
index 00000000..45e60211
--- /dev/null
+++ b/gemfiles/Gemfile-rails-7-0
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'country_select'
+gem 'activemodel', '~> 7.0.0'
+gem 'actionpack', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
+gem 'rake'