From f3eeac78a20fee68abc3d16e866693d512ce6dfe Mon Sep 17 00:00:00 2001
From: Tristan Starck <tstarck@invoca.com>
Date: Tue, 28 Jan 2025 15:03:23 -0800
Subject: [PATCH 1/5] Add base64, bigdecimal, and mutex_m to gemfiles to
 support Ruby 3.4

---
 Gemfile                    | 4 ++++
 Gemfile.lock               | 7 +++++++
 gemfiles/rails_6_0.gemfile | 3 +++
 gemfiles/rails_6_1.gemfile | 3 +++
 gemfiles/rails_7_0.gemfile | 3 +++
 gemfiles/rails_7_1.gemfile | 3 +++
 6 files changed, 23 insertions(+)

diff --git a/Gemfile b/Gemfile
index 78ca8c4..382d9bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,3 +12,7 @@ gem 'sqlite3', '~> 1.4'
 
 gem 'minitest'
 gem 'minitest-reporters'
+
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 02ccf57..bfc5c73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,6 +134,8 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
+    nokogiri (1.16.6-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.6-x86_64-linux)
@@ -187,6 +189,7 @@ GEM
     reline (0.5.9)
       io-console (~> 0.5)
     ruby-progressbar (1.13.0)
+    sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
     stringio (3.1.1)
@@ -201,6 +204,7 @@ GEM
     zeitwerk (2.6.16)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-23
   x86_64-linux
 
@@ -208,8 +212,11 @@ DEPENDENCIES
   appraisal
   appraisal-matrix
   attr_default!
+  base64 (~> 0.2.0)
+  bigdecimal (~> 3.1)
   minitest
   minitest-reporters
+  mutex_m (~> 0.2.0)
   pry
   rake
   sqlite3 (~> 1.4)
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index bcedfe5..f40283c 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -9,6 +9,9 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
 gem "rails", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
index 280f652..e25a77f 100644
--- a/gemfiles/rails_6_1.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -9,6 +9,9 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
index f03123f..83701d3 100644
--- a/gemfiles/rails_7_0.gemfile
+++ b/gemfiles/rails_7_0.gemfile
@@ -9,6 +9,9 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
index 2ae7c4f..b1ad24d 100644
--- a/gemfiles/rails_7_1.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -9,6 +9,9 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
 gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

From 407a9076e7fe169eed8b2099ceea10b81f5c36f4 Mon Sep 17 00:00:00 2001
From: Tristan Starck <tstarck@invoca.com>
Date: Tue, 28 Jan 2025 15:05:40 -0800
Subject: [PATCH 2/5] add new gemfiles

---
 gemfiles/rails_7_2.gemfile | 17 +++++++++++++++++
 gemfiles/rails_8_0.gemfile | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 gemfiles/rails_7_2.gemfile
 create mode 100644 gemfiles/rails_8_0.gemfile

diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile
new file mode 100644
index 0000000..fe268a9
--- /dev/null
+++ b/gemfiles/rails_7_2.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "appraisal-matrix"
+gem "pry"
+gem "rake"
+gem "sqlite3", "~> 1.4"
+gem "minitest"
+gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
new file mode 100644
index 0000000..43b0c61
--- /dev/null
+++ b/gemfiles/rails_8_0.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "appraisal-matrix"
+gem "pry"
+gem "rake"
+gem "sqlite3", "~> 1.4"
+gem "minitest"
+gem "minitest-reporters"
+gem "base64", "~> 0.2.0"
+gem "bigdecimal", "~> 3.1"
+gem "mutex_m", "~> 0.2.0"
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

From c90b3e6d9144b5586873021218f5a3b4292d0345 Mon Sep 17 00:00:00 2001
From: Tristan Starck <tstarck@invoca.com>
Date: Tue, 28 Jan 2025 15:10:23 -0800
Subject: [PATCH 3/5] Add concurrent-ruby to gemfiles to fix tests in Rails <
 7.1

---
 Gemfile                    | 2 ++
 Gemfile.lock               | 1 +
 gemfiles/rails_6_0.gemfile | 1 +
 gemfiles/rails_6_1.gemfile | 1 +
 gemfiles/rails_7_0.gemfile | 1 +
 gemfiles/rails_7_1.gemfile | 1 +
 gemfiles/rails_7_2.gemfile | 1 +
 gemfiles/rails_8_0.gemfile | 1 +
 8 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 382d9bd..9797834 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,3 +16,5 @@ gem 'minitest-reporters'
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
diff --git a/Gemfile.lock b/Gemfile.lock
index bfc5c73..63d6bfe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,6 +214,7 @@ DEPENDENCIES
   attr_default!
   base64 (~> 0.2.0)
   bigdecimal (~> 3.1)
+  concurrent-ruby (~> 1.3, < 1.3.5)
   minitest
   minitest-reporters
   mutex_m (~> 0.2.0)
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index f40283c..ae64380 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
index e25a77f..c3dc74a 100644
--- a/gemfiles/rails_6_1.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
index 83701d3..e307b20 100644
--- a/gemfiles/rails_7_0.gemfile
+++ b/gemfiles/rails_7_0.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
index b1ad24d..d549620 100644
--- a/gemfiles/rails_7_1.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile
index fe268a9..2f8c544 100644
--- a/gemfiles/rails_7_2.gemfile
+++ b/gemfiles/rails_7_2.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 7.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
index 43b0c61..439d6b9 100644
--- a/gemfiles/rails_8_0.gemfile
+++ b/gemfiles/rails_8_0.gemfile
@@ -12,6 +12,7 @@ gem "minitest-reporters"
 gem "base64", "~> 0.2.0"
 gem "bigdecimal", "~> 3.1"
 gem "mutex_m", "~> 0.2.0"
+gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
 gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

From 6ea486bd87ad0f680a3023228c1f479272208a01 Mon Sep 17 00:00:00 2001
From: Tristan Starck <tstarck@invoca.com>
Date: Tue, 28 Jan 2025 15:28:21 -0800
Subject: [PATCH 4/5] use optimistic flag for bundle add

---
 Gemfile      | 7 ++++---
 Gemfile.lock | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9797834..4200fce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,8 +13,9 @@ gem 'sqlite3', '~> 1.4'
 gem 'minitest'
 gem 'minitest-reporters'
 
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 63d6bfe..2f74c27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,12 +212,12 @@ DEPENDENCIES
   appraisal
   appraisal-matrix
   attr_default!
-  base64 (~> 0.2.0)
-  bigdecimal (~> 3.1)
+  base64 (>= 0.2.0)
+  bigdecimal (>= 3.1)
   concurrent-ruby (~> 1.3, < 1.3.5)
   minitest
   minitest-reporters
-  mutex_m (~> 0.2.0)
+  mutex_m (>= 0.2.0)
   pry
   rake
   sqlite3 (~> 1.4)

From 804e5ca9b7cb6490acf85fa82109d8d90cff5de6 Mon Sep 17 00:00:00 2001
From: Tristan Starck <tstarck@invoca.com>
Date: Tue, 28 Jan 2025 15:33:15 -0800
Subject: [PATCH 5/5] regenerate gemfiles

---
 gemfiles/rails_6_0.gemfile | 6 +++---
 gemfiles/rails_6_1.gemfile | 6 +++---
 gemfiles/rails_7_0.gemfile | 6 +++---
 gemfiles/rails_7_1.gemfile | 6 +++---
 gemfiles/rails_7_2.gemfile | 6 +++---
 gemfiles/rails_8_0.gemfile | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
index ae64380..5b78cf0 100644
--- a/gemfiles/rails_6_0.gemfile
+++ b/gemfiles/rails_6_0.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
index c3dc74a..41f49cb 100644
--- a/gemfiles/rails_6_1.gemfile
+++ b/gemfiles/rails_6_1.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
index e307b20..00d0129 100644
--- a/gemfiles/rails_7_0.gemfile
+++ b/gemfiles/rails_7_0.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
index d549620..f88f1f2 100644
--- a/gemfiles/rails_7_1.gemfile
+++ b/gemfiles/rails_7_1.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile
index 2f8c544..85c22c1 100644
--- a/gemfiles/rails_7_2.gemfile
+++ b/gemfiles/rails_7_2.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 7.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
index 439d6b9..647808a 100644
--- a/gemfiles/rails_8_0.gemfile
+++ b/gemfiles/rails_8_0.gemfile
@@ -9,10 +9,10 @@ gem "rake"
 gem "sqlite3", "~> 1.4"
 gem "minitest"
 gem "minitest-reporters"
-gem "base64", "~> 0.2.0"
-gem "bigdecimal", "~> 3.1"
-gem "mutex_m", "~> 0.2.0"
 gem "concurrent-ruby", "~> 1.3", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.2.0"
 gem "rails", "~> 8.0.0"
 
 gemspec path: "../"