From 95c72f53794f85caad655141b1b066513e744ebb Mon Sep 17 00:00:00 2001
From: Neethan Balaventhan <neethan.balaventhan@shopify.com>
Date: Tue, 10 Mar 2026 16:51:01 -0400
Subject: [PATCH] chore: update CI matrix, bump version to 3.3.0

Update CI to test against currently supported Ruby and Rails versions:
- Ruby: 3.2, 3.3, 3.4 (drop 3.1 which is EOL)
- Rails: 7.2, 8.0, edge (drop 7.0 and 7.1 which are EOL)

Update GitHub Actions to unpinned major versions:
- actions/checkout@v4 (was pinned to v1.2.0 SHA)
- ruby/setup-ruby@v1 (was pinned to v1.238.0 SHA)

Bump minimum requirements:
- required_ruby_version >= 3.2.0 (was >= 3.0.0)
- activesupport >= 7.2 (was >= 5.2)

Bump gem version to 3.3.0.
---
 .github/workflows/ci.yml   | 10 ++++++----
 gemfiles/rails-7.0.gemfile |  6 ------
 gemfiles/rails-7.1.gemfile |  6 ------
 gemfiles/rails-7.2.gemfile |  6 ++++++
 gemfiles/rails-8.0.gemfile |  6 ++++++
 lib/measured/version.rb    |  2 +-
 measured.gemspec           |  4 ++--
 7 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 gemfiles/rails-7.0.gemfile
 delete mode 100644 gemfiles/rails-7.1.gemfile
 create mode 100644 gemfiles/rails-7.2.gemfile
 create mode 100644 gemfiles/rails-8.0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d62677b..8ab8b05 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,10 +12,12 @@ jobs:
         ruby:
           - '3.2'
           - '3.3'
+          - '3.4'
+          - '4.0'
         gemfile:
           - Gemfile
-          - gemfiles/rails-7.0.gemfile
-          - gemfiles/rails-7.1.gemfile
+          - gemfiles/rails-7.2.gemfile
+          - gemfiles/rails-8.0.gemfile
           - gemfiles/rails-edge.gemfile
         exclude:
           - ruby: '3.2'
@@ -23,9 +25,9 @@ jobs:
 
     name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
+      - uses: actions/checkout@v4
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
diff --git a/gemfiles/rails-7.0.gemfile b/gemfiles/rails-7.0.gemfile
deleted file mode 100644
index 68da491..0000000
--- a/gemfiles/rails-7.0.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activesupport', '~> 7.0'
-gem 'activerecord', '~> 7.0'
diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile
deleted file mode 100644
index abecbf0..0000000
--- a/gemfiles/rails-7.1.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activesupport', '~> 7.1'
-gem "activerecord", '~> 7.1'
diff --git a/gemfiles/rails-7.2.gemfile b/gemfiles/rails-7.2.gemfile
new file mode 100644
index 0000000..026a36b
--- /dev/null
+++ b/gemfiles/rails-7.2.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.2'
+gem 'activerecord', '~> 7.2'
diff --git a/gemfiles/rails-8.0.gemfile b/gemfiles/rails-8.0.gemfile
new file mode 100644
index 0000000..97f6625
--- /dev/null
+++ b/gemfiles/rails-8.0.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 8.0'
+gem 'activerecord', '~> 8.0'
diff --git a/lib/measured/version.rb b/lib/measured/version.rb
index 5dd972a..a967583 100644
--- a/lib/measured/version.rb
+++ b/lib/measured/version.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Measured
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end
diff --git a/measured.gemspec b/measured.gemspec
index 739adb1..bb81b1b 100644
--- a/measured.gemspec
+++ b/measured.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/measured"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", ">= 5.2"
+  spec.add_runtime_dependency "activesupport", ">= 7.2"
 
   spec.add_development_dependency "rake", "> 10.0"
   spec.add_development_dependency "minitest", "> 5.5.1"