From 4770fdc2d6106f3ad6966e1f6e2d755591e6252c Mon Sep 17 00:00:00 2001
From: Kevin McPhillips <github@kevinmcphillips.ca>
Date: Wed, 2 Oct 2024 18:19:52 -0400
Subject: [PATCH] Bump edge to support Rails 8. Drop older rails support. Move
 Ruby support up to 3.3.

---
 .github/workflows/ci.yml   | 10 +++++-----
 gemfiles/rails-6.0.gemfile |  6 ------
 gemfiles/rails-6.1.gemfile |  6 ------
 gemfiles/rails-7.1.gemfile |  6 ++++++
 measured.gemspec           |  2 +-
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 gemfiles/rails-6.0.gemfile
 delete mode 100644 gemfiles/rails-6.1.gemfile
 create mode 100644 gemfiles/rails-7.1.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d160576..554a607 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,18 +10,18 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
         gemfile:
           - Gemfile
-          - gemfiles/rails-6.0.gemfile
-          - gemfiles/rails-6.1.gemfile
           - gemfiles/rails-7.0.gemfile
+          - gemfiles/rails-7.1.gemfile
           - gemfiles/rails-edge.gemfile
         exclude:
-          # Rails Edge only supports Ruby >= 3.1
-          - ruby: '3.0'
+          - ruby: '3.1'
+            gemfile: gemfiles/rails-edge.gemfile
+          - ruby: '3.2'
             gemfile: gemfiles/rails-edge.gemfile
 
     name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile
deleted file mode 100644
index 9330bfa..0000000
--- a/gemfiles/rails-6.0.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activesupport', '~> 6.0'
-gem "activerecord", '~> 6.0'
diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile
deleted file mode 100644
index 0c93be8..0000000
--- a/gemfiles/rails-6.1.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activesupport', '~> 6.1'
-gem "activerecord", '~> 6.1'
diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile
new file mode 100644
index 0000000..abecbf0
--- /dev/null
+++ b/gemfiles/rails-7.1.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.1'
+gem "activerecord", '~> 7.1'
diff --git a/measured.gemspec b/measured.gemspec
index 0789c64..093c830 100644
--- a/measured.gemspec
+++ b/measured.gemspec
@@ -36,6 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mocha", ">= 1.4.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "combustion"
-  spec.add_development_dependency "sqlite3", "~> 1.4"
+  spec.add_development_dependency "sqlite3", "> 1.4"
   spec.add_development_dependency "tapioca"
 end