Merge branch 'Shopify:main' into add-quintals-and-t-aliases

Author: ragarwal6397

.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 }}

gemfiles/rails-6.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activesupport', '~> 7.1'
+gem "activerecord", '~> 7.1'

gemfiles/rails-6.1.gemfile

@@ -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