Drop Ruby 3.0 support

gocardless · Aug 21, 2024 · 6edf722 · 6edf722
1 parent 5e50084
commit 6edf722
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 68 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -24,9 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.7", "3.0", "3.1", "3.3"]
+        ruby-version: ["3.1", "3.2", "3.3"]
         activerecord-version:
-          - "6.1.5"
           - "7.0.8"
           - "7.1.3.4"
           - "7.2.0"
@@ -36,8 +35,8 @@ jobs:
         image: postgres:14
         env:
           POSTGRES_USER: postgres
-          POSTGRES_DB: statesman_test
-          POSTGRES_PASSWORD: statesman
+          POSTGRES_DB: safer_migrations_test
+          POSTGRES_PASSWORD: safer_migrations
         ports:
           - 5432:5432
         options: >-
@@ -46,7 +45,7 @@ jobs:
           --health-timeout 5s
           --health-retries 10
     env:
-      DATABASE_URL: postgres://postgres:statesman@localhost/statesman_test
+      DATABASE_URL: postgres://postgres:safer_migrations@localhost/safer_migrations_test
       DATABASE_DEPENDENCY_PORT: "5432"
       ACTIVERECORD_VERSION: "${{ matrix.activerecord-version }}"
     steps:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,6 +3,7 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 3.2
+  NewCops: enable
 
 Gemspec/RequiredRubyVersion:
   Enabled: false

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
-# 4.0.0 / 2023-09-19
+# 4.0.0 / 2024-08-21
 
-- Remove support for Ruby =< 2.7
+- Remove support for Ruby =< 3.0 and Rails =< 6.0
 
 # 3.0.0 / 2020-09-28
 

diff --git a/Gemfile b/Gemfile
@@ -7,8 +7,7 @@ gemspec
 gem "activerecord", "~> #{ENV['ACTIVERECORD_VERSION']}" if ENV["ACTIVERECORD_VERSION"]
 
 group :test, :development do
-  gem "gc_ruboconfig", "~> 4.3"
+  gem "gc_ruboconfig", "~> 5.0"
   gem "pg", "~> 1.4"
   gem "rspec", "~> 3.9.0"
-  gem "rubocop", "~> 1.56.3"
 end
diff --git a/activerecord-safer_migrations.gemspec b/activerecord-safer_migrations.gemspec
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/gocardless/activerecord-safer_migrations"
   gem.license       = "MIT"
 
-  gem.required_ruby_version = ">= 2.7"
+  gem.required_ruby_version = ">= 3.1"
 
-  gem.add_runtime_dependency "activerecord", ">= 6.0"
+  gem.add_dependency "activerecord", ">= 7.0"
   gem.metadata["rubygems_mfa_required"] = "true"
 end
diff --git a/lib/activerecord-safer_migrations.rb b/lib/activerecord-safer_migrations.rb
@@ -37,4 +37,4 @@ def self.load
   end
 end
 
-require "active_record/safer_migrations/railtie" if defined?(::Rails)
+require "active_record/safer_migrations/railtie" if defined?(Rails)
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ def self.load @@
       end
     end
-    require "active_record/safer_migrations/railtie" if defined?(::Rails)
+    require "active_record/safer_migrations/railtie" if defined?(Rails)