From b80e4832c1d8fe61628b1f69883103952035275a Mon Sep 17 00:00:00 2001
From: Mathieu Jobin <mathieu@justbudget.com>
Date: Mon, 18 Oct 2021 17:49:38 +0900
Subject: [PATCH] allow rails 7.0

---
 .github/workflows/build.yml                   | 49 ++++++++++---------
 gemfiles/rails_4.2.gemfile.lock               |  6 +--
 .../{rails_5_2.gemfile => rails_5.2.gemfile}  |  0
 gemfiles/rails_7.0.gemfile                    |  6 +++
 webhook_system.gemspec                        |  6 +--
 5 files changed, 37 insertions(+), 30 deletions(-)
 rename gemfiles/{rails_5_2.gemfile => rails_5.2.gemfile} (100%)
 create mode 100644 gemfiles/rails_7.0.gemfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 459c531..d1c3d51 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,30 +15,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - 2.7
-          - 2.6
-          - 2.5
-        gemfile:
-          - rails_4.2
-          - rails_5.0
-          - rails_5.1
-          - rails_5_2
-          - rails_6.0
-          - rails_6.1
-        exclude:
-        - gemfile: rails_4.2
-          ruby: 2.7
-        - gemfile: rails_4.2
-          ruby: 3.0
-        - gemfile: rails_5.0
-          ruby: 2.7
-        - gemfile: rails_5.0
-          ruby: 3.0
-        - gemfile: rails_5.1
-          ruby: 2.7
-        - gemfile: rails_5.1
-          ruby: 3.0
+        gemfile: ["rails_7.0"]
+        ruby: [2.7]
+        include:
+          - gemfile: rails_7.0
+            ruby: '3.0'
+          - gemfile: rails_6.1
+            ruby: '3.0'
+          - gemfile: rails_6.1
+            ruby: 2.7
+          - gemfile: rails_6.1
+            ruby: 2.6
+          - gemfile: rails_6.0
+            ruby: 2.7
+          - gemfile: rails_6.0
+            ruby: 2.6
+          - gemfile: rails_5.2
+            ruby: 2.6
+          - gemfile: rails_5.1
+            ruby: 2.6
+          - gemfile: rails_5.0
+            ruby: 2.6
+          - gemfile: rails_4.2
+            ruby: 2.6
+          - gemfile: rails_4.2
+            ruby: 2.5
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock
index 6a6f7aa..b5c902f 100644
--- a/gemfiles/rails_4.2.gemfile.lock
+++ b/gemfiles/rails_4.2.gemfile.lock
@@ -2,9 +2,9 @@ PATH
   remote: ..
   specs:
     webhook_system (2.3.1)
-      activejob (> 4.2, < 7.0)
-      activerecord (> 4.2, < 7.0)
-      activesupport (> 4.2, < 7.0)
+      activejob (> 4.2, < 7.1)
+      activerecord (> 4.2, < 7.1)
+      activesupport (> 4.2, < 7.1)
       faraday (> 0.9)
       faraday-encoding (>= 0.0.2, < 1.0)
       ph_model
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5.2.gemfile
similarity index 100%
rename from gemfiles/rails_5_2.gemfile
rename to gemfiles/rails_5.2.gemfile
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
new file mode 100644
index 0000000..1f148da
--- /dev/null
+++ b/gemfiles/rails_7.0.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.2"
+gem "sqlite3"
+
+gemspec path: "../"
diff --git a/webhook_system.gemspec b/webhook_system.gemspec
index b895e73..6f901a7 100644
--- a/webhook_system.gemspec
+++ b/webhook_system.gemspec
@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'activesupport', '> 4.2', '< 7.0'
-  gem.add_runtime_dependency 'activerecord', '> 4.2', '< 7.0'
-  gem.add_runtime_dependency 'activejob', '> 4.2', '< 7.0'
+  gem.add_runtime_dependency 'activesupport', '> 4.2', '< 7.1'
+  gem.add_runtime_dependency 'activerecord', '> 4.2', '< 7.1'
+  gem.add_runtime_dependency 'activejob', '> 4.2', '< 7.1'
   gem.add_runtime_dependency 'faraday', '> 0.9'
   gem.add_runtime_dependency 'faraday-encoding', '>= 0.0.2', '< 1.0'
   gem.add_runtime_dependency 'ph_model'