From 47dd0ae143f28127948057a076a77224cf5839bc Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Fri, 30 May 2025 16:55:56 +0900
Subject: [PATCH 1/9] =?UTF-8?q?chore:=20Rails7.1=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=E3=81=95=E3=81=9B=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple_group.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/simple_group.gemspec b/simple_group.gemspec
index 8f9f2d4..13e2e4c 100644
--- a/simple_group.gemspec
+++ b/simple_group.gemspec
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", '< 7.1.0', '>= 5.0.0'
-  spec.add_dependency "activesupport", '< 7.1.0', '>= 5.0.0'
-  spec.add_dependency "railties", '< 7.1.0', '>= 5.0.0'
+  spec.add_dependency "activerecord", '< 7.2.0', '>= 5.0.0'
+  spec.add_dependency "activesupport", '< 7.2.0', '>= 5.0.0'
+  spec.add_dependency "railties", '< 7.2.0', '>= 5.0.0'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"

From 6ebcf128f756a0acbeb4012fce6486336de3661b Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Sat, 7 Jun 2025 15:11:29 +0900
Subject: [PATCH 2/9] =?UTF-8?q?chore:=20concurrent-ruby=20gem1.3.5?=
 =?UTF-8?q?=E3=81=A7=E3=81=AFLogger=E9=96=A2=E9=80=A3=E3=81=AE=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=8C=E5=85=A5=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E3=81=93=E3=81=A8=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=81?=
 =?UTF-8?q?1.3.4=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple_group.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/simple_group.gemspec b/simple_group.gemspec
index 13e2e4c..9245c02 100644
--- a/simple_group.gemspec
+++ b/simple_group.gemspec
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", '< 7.2.0', '>= 5.0.0'
   spec.add_dependency "activesupport", '< 7.2.0', '>= 5.0.0'
   spec.add_dependency "railties", '< 7.2.0', '>= 5.0.0'
+  spec.add_development_dependency "concurrent-ruby", '1.3.4'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"

From b9b2676ee0815be8fd9ce6ce766af0fa7d0d5b3f Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Sat, 7 Jun 2025 15:15:02 +0900
Subject: [PATCH 3/9] =?UTF-8?q?ci:chore:=20Rails7.1=E3=81=AE=E3=83=86?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E8=BF=BD=E5=8A=A0=E3=80=81Ruby3.2,3.3,3.4?=
 =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=83=91=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 22 ++++++++++++++++++++--
 gemfiles/rails_7.1.gemfile |  8 ++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 gemfiles/rails_7.1.gemfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 172591e..f4ae34b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1']
-        gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0]
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0, rails_7.1]
         exclude:
           - ruby: '2.6'
             gemfile: rails_7.0
@@ -30,6 +30,24 @@ jobs:
             gemfile: rails_5.2
           - ruby: '3.1'
             gemfile: rails_7.0
+          - ruby: '3.2'
+            gemfile: rails_5.0
+          - ruby: '3.2'
+            gemfile: rails_5.1
+          - ruby: '3.2'
+            gemfile: rails_5.2
+          - ruby: '3.3'
+            gemfile: rails_5.0
+          - ruby: '3.3'
+            gemfile: rails_5.1
+          - ruby: '3.3'
+            gemfile: rails_5.2
+          - ruby: '3.4'
+            gemfile: rails_5.0
+          - ruby: '3.4'
+            gemfile: rails_5.1
+          - ruby: '3.4'
+            gemfile: rails_5.2
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
 
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
new file mode 100644
index 0000000..3530c0f
--- /dev/null
+++ b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.1.0'
+gem 'activesupport', '~> 7.1.0'
+gem 'railties', '~> 7.1.0'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '../'

From 90fdabfda2710561cc7d7aceb97f4bbe2cf9b2d3 Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Tue, 10 Jun 2025 13:14:08 +0900
Subject: [PATCH 4/9] =?UTF-8?q?chore:=20Ruby3.4=E3=81=8B=E3=82=89bundled?=
 =?UTF-8?q?=20gem=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=9Fgem=E3=82=92=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=AB?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple_group.gemspec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/simple_group.gemspec b/simple_group.gemspec
index 9245c02..8f057c4 100644
--- a/simple_group.gemspec
+++ b/simple_group.gemspec
@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency 'database_cleaner', '~> 2.0'
+  spec.add_development_dependency 'mutex_m', '~> 0.1'
+  spec.add_development_dependency 'base64', '~> 0.1'
+  spec.add_development_dependency 'bigdecimal', '~> 3.0'
 end

From e01af422d47aeefda1b584505508704e551b2bbd Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Tue, 10 Jun 2025 13:14:59 +0900
Subject: [PATCH 5/9] =?UTF-8?q?ci:=20Ruby2.6=E3=81=A7=E3=81=AFRails7.1?=
 =?UTF-8?q?=E3=82=92=E5=88=A9=E7=94=A8=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=AF=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E3=80=81=E3=81=9D=E3=81=AE=E3=83=91=E3=82=BF=E3=83=BC=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=81=AF=E9=99=A4=E5=A4=96?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f4ae34b..54c9bd1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,6 +16,8 @@ jobs:
         exclude:
           - ruby: '2.6'
             gemfile: rails_7.0
+          - ruby: '2.6'
+            gemfile: rails_7.1
           - ruby: '3.0'
             gemfile: rails_5.0
           - ruby: '3.0'

From e082d095c665a441fc8b5a75ea33e323fe6335af Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Wed, 18 Jun 2025 14:55:48 +0900
Subject: [PATCH 6/9] =?UTF-8?q?chore:=20=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=920.6.0=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/simple_group/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_group/version.rb b/lib/simple_group/version.rb
index 85149ac..248728c 100644
--- a/lib/simple_group/version.rb
+++ b/lib/simple_group/version.rb
@@ -1,3 +1,3 @@
 module SimpleGroup
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

From 0e19dfdb2a633783d54458c5eb6c10cd9f7b4880 Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Wed, 18 Jun 2025 14:59:36 +0900
Subject: [PATCH 7/9] =?UTF-8?q?ci:=20Ruby3.1=E3=80=81Rails7.0=E3=81=AE?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=91=E3=82=BF=E3=83=BC=E3=83=B3?=
 =?UTF-8?q?=E9=99=A4=E5=A4=96=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 54c9bd1..5bffac5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,8 +30,6 @@ jobs:
             gemfile: rails_5.1
           - ruby: '3.1'
             gemfile: rails_5.2
-          - ruby: '3.1'
-            gemfile: rails_7.0
           - ruby: '3.2'
             gemfile: rails_5.0
           - ruby: '3.2'

From a2d41b8015094ce1a287d7ba9ed96c26e6816aac Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Wed, 18 Jun 2025 14:59:49 +0900
Subject: [PATCH 8/9] =?UTF-8?q?ci:=20sqlite3=E3=81=AE=E3=83=93=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7=E3=80=81bundler-cache=E3=82=92false=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=80=81=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=ABbundle=20?=
 =?UTF-8?q?install=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=A7=E5=9B=9E?=
 =?UTF-8?q?=E9=81=BF=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5bffac5..39ccb93 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,6 +57,8 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+          bundler-cache: false
+      - name: Bundle install
+        run: bundle install
       - name: Run tests
         run: bundle exec rake

From 577452f0c5437a4da482e3b2706284dd99dbd8a8 Mon Sep 17 00:00:00 2001
From: shino <t-shinohara@rhizome-e.com>
Date: Wed, 18 Jun 2025 15:00:09 +0900
Subject: [PATCH 9/9] =?UTF-8?q?test:chore:=20database=5Fcleaner=E3=81=A8sq?=
 =?UTF-8?q?lite3=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=8C=E5=90=88=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=9F=E3=80=82Rails7.1=E3=81=A7=E3=81=AFR?=
 =?UTF-8?q?uby=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=80=81sqlite3=E3=81=AE?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gemfiles/rails_5.0.gemfile | 1 +
 gemfiles/rails_5.1.gemfile | 2 +-
 gemfiles/rails_7.1.gemfile | 6 +++++-
 simple_group.gemspec       | 4 ++--
 test/test_helper.rb        | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
index 0334047..b2813b6 100644
--- a/gemfiles/rails_5.0.gemfile
+++ b/gemfiles/rails_5.0.gemfile
@@ -4,5 +4,6 @@ gem 'activerecord', '~> 5.0.0'
 gem 'activesupport', '~> 5.0.0'
 gem 'railties', '~> 5.0.0'
 gem 'sqlite3', '~> 1.3.0'
+gem 'database_cleaner', '~> 1.99'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index 62f4849..db7c77c 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.1.0'
 gem 'activesupport', '~> 5.1.0'
 gem 'railties', '~> 5.1.0'
-gem 'sqlite3', '~> 1.3.0'
+gem 'sqlite3', '~> 1.4'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
index 3530c0f..52cb944 100644
--- a/gemfiles/rails_7.1.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 7.1.0'
 gem 'activesupport', '~> 7.1.0'
 gem 'railties', '~> 7.1.0'
-gem 'sqlite3', '~> 1.4'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
+  gem 'sqlite3', '~> 2.0'
+else
+  gem 'sqlite3', '~> 1.4'
+end
 
 gemspec path: '../'
diff --git a/simple_group.gemspec b/simple_group.gemspec
index 8f057c4..c6b0ba1 100644
--- a/simple_group.gemspec
+++ b/simple_group.gemspec
@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "concurrent-ruby", '1.3.4'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency 'database_cleaner', '~> 2.0'
+  spec.add_development_dependency "sqlite3", '< 3.0', '>= 1.3'
+  spec.add_development_dependency 'database_cleaner', '< 3.0', '>= 1.99.0'
   spec.add_development_dependency 'mutex_m', '~> 0.1'
   spec.add_development_dependency 'base64', '~> 0.1'
   spec.add_development_dependency 'bigdecimal', '~> 3.0'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3a84794..40849e8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'active_record'
-require 'database_cleaner/active_record'
+# database_cleaner 1～2系のどちらでも動くようにするため、パスを修正
+require 'database_cleaner'
 require 'simple_group'
 require 'pry'