Add support for ActiveRecord 7.2, Bump minimum Ruby to 3.2 and ActiveRecord to 7.1 (#349)

* Add support for ActiveRecord 7.2

* Bump minimum ActiveRecord to 7.1

* Bump minimum Ruby to 3.2

* Use bundle binstubs in CI

Author: n-rodriguez

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["3.2", "3.3", "3.4"]
-        activerecord: [61, 70, 71, 80]
+        activerecord: [71, 72, 80]
 
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
           bundler-cache: true
 
       - name: Run tests
-        run: bundle exec rake
+        run: bin/rake
 
   publish:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'

.github/workflows/linting.yml

@@ -17,12 +17,12 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.4
+          ruby-version: 3.2
           bundler: latest
           bundler-cache: true
 
       - name: Rubocop
-        run: bundle exec rubocop
+        run: bin/rubocop
 
       - name: Syntax tree
-        run: bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')
+        run: bin/stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')

.rubocop.yml

@@ -2,6 +2,7 @@ inherit_gem:
   rubocop-discourse: default.yml
 
 AllCops:
+  TargetRubyVersion: "3.2"
   Exclude:
     - 'bin/*'
     - 'gemfiles/**/*'

Appraisals

@@ -1,32 +1,13 @@
 # frozen_string_literal: true
 
-appraise "ar-61" do
-  gem "activerecord", "~> 6.1.1"
-
-  # Fix:
-  # warning: mutex_m was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0.
-  # Add mutex_m to your Gemfile or gemspec.
-  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
-    gem 'base64'
-    gem 'mutex_m'
-  end
-end
-
-appraise "ar-70" do
-  gem "activerecord", "~> 7.0.0"
-
-  # Fix:
-  # warning: mutex_m was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.4.0.
-  # Add mutex_m to your Gemfile or gemspec.
-  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
-    gem 'mutex_m'
-  end
-end
-
 appraise "ar-71" do
   gem "activerecord", "~> 7.1.0"
 end
 
+appraise "ar-72" do
+  gem "activerecord", "~> 7.2.0"
+end
+
 appraise "ar-80" do
   gem "activerecord", "~> 8.0.0"
 end

gemfiles/ar_61.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.2.0"
 gem "bundler", ">= 2.1.4"
 gem "m"
 gem "mini_racer", "~> 0.12.0"
@@ -20,8 +20,4 @@ gem "guard-minitest", "~> 2.0", require: false
 gem "rubocop", ">= 0.69", require: false
 gem "rubocop-discourse", ">= 3", require: false
 
-install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
-  gem "mutex_m"
-end
-
 gemspec path: "../"

gemfiles/ar_70.gemfile renamed to gemfiles/ar_72.gemfile

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/discourse/prometheus_exporter"
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.files = Dir['README.md', 'CHANGELOG', 'LICENSE.txt', 'lib/**/*.rb', 'exe/*']