Merge pull request #324 from active-hash/flavorjones-version-support-…

…202410 Update supported versions of Ruby and Rails
active-hash · Oct 16, 2024 · 0d8b3e8 · 0d8b3e8
2 parents 0b3701c + 7950e8e
commit 0d8b3e8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 82 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -22,39 +22,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # | rails | rails EOL | ruby EOL | min ruby| max |
-        # | ----- | ---------+| --------+| --------|---- |
-        # | 5.0   |  6/2020   |   3/2020 |   2.2   | 2.4 |
-        # | 5.1   |  6/2021   |   3/2021 |   2.2   | 2.5 |
-        # | 5.2   |  6/2022   |   3/2022 |   2.2   | 2.6 |
-        # | 6.0   |  6/2023   |   3/2023 |   2.5   | 2.7 |
-        # | 6.1   | 10/2024   |          |   2.5   |     |
-        # | 7.0   |  4/2025   |          |   2.7   |     |
-        # | 7.1   | 10/2025   |          |   2.7   |     |
-        # | 7.2   |  8/2026   |          |   3.1   |     |
+        # | rails | rails EOL | minruby |
+        # |-------+-----------+---------+
+        # | 6.1   |  10/2024  |   2.5   |
+        # | 7.0   |   4/2025  |   2.7   |
+        # | 7.1   |  10/2025  |   2.7   |
+        # | 7.2   |   8/2026  |   3.1   |
+        # | 8.0   | ~11/2026  |   3.2   |
         ruby: ['3.0', '3.1', '3.2', '3.3']
         gemfile:
           - 'gemfiles/rails_6.1.gemfile'
           - 'gemfiles/rails_7.0.gemfile'
           - 'gemfiles/rails_7.1.gemfile'
           - 'gemfiles/rails_7.2.gemfile'
-        include:
-        - ruby: '2.4'
-          gemfile: 'gemfiles/rails_5.0.gemfile'
-        - ruby: '2.5'
-          gemfile: 'gemfiles/rails_5.1.gemfile'
-        - ruby: '2.6'
-          gemfile: 'gemfiles/rails_5.2.gemfile'
-        - ruby: '2.7'
-          gemfile: 'gemfiles/rails_6.0.gemfile'
+          - 'gemfiles/rails_8.0.gemfile'
         exclude:
         - ruby: '3.0'
           gemfile: 'gemfiles/rails_7.2.gemfile'
+        - ruby: '3.0'
+          gemfile: 'gemfiles/rails_8.0.gemfile'
+        - ruby: '3.1'
+          gemfile: 'gemfiles/rails_8.0.gemfile'
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     name: Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

diff --git a/Gemfile b/Gemfile
@@ -15,4 +15,4 @@ platforms :ruby do
   gem 'sqlite3', '~> 1.4', '< 2.0' # can allow 2.0 once Rails's sqlite adapter allows it
 end
 
-gem 'activerecord', '>= 5.0.0'
+gem 'activerecord', '>= 6.1.0'
diff --git a/README.md b/README.md
@@ -34,7 +34,11 @@ Other:
 gem install active_hash
 ```
 
-**Currently version 2.x doesn't support Ruby < 2.4 and Rails < 5**. If you use these versions, please use 1.x.
+Requirements:
+
+- v1.x: Ruby >= 1.9.3, Rails >= 2.2.2
+- v2.x, v3.x: Ruby >= 2.4, Rails >= 5
+- upcoming: Ruby >= 3.0, Rails >= 6.1
 
 ```ruby
 gem 'active_hash', '~> 1.5.3'
@@ -633,10 +637,10 @@ If your changes seem reasonable and the specs pass I'll give you commit rights t
 
 ## Releasing a new version
 
-To make users' lives easier, please maintain support for:
+To make users' lives easier, CI will exercise tests for:
 
-  * Ruby 2.4
-  * ActiveRecord/ActiveSupport from 5.0 through edge
+  * Ruby 3.0 through current
+  * ActiveRecord/ActiveSupport from 6.1 through edge
 
 Once appraisal passes in all supported rubies, follow these steps to release a new version of active_hash:
 

diff --git a/active_hash.gemspec b/active_hash.gemspec
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
     Dir.glob("lib/**/*")
   ].flatten
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.add_runtime_dependency('activesupport', '>= 5.0.0')
+  s.add_runtime_dependency('activesupport', '>= 6.1.0')
   s.add_development_dependency "pry"
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 3.0.0'
 end
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
diff --git a/gemfiles/rails_5.0.gemfile → gemfiles/rails_8.0.gemfile b/gemfiles/rails_5.0.gemfile → gemfiles/rails_8.0.gemfile
@@ -1,8 +1,8 @@
 source 'http://rubygems.org/'
 
-gem 'activerecord', '~> 5.0.0'
-gem 'rspec', '~> 3.9'
-gem 'rake', '~> 10.0'
+gem 'activerecord', '~> 8.0.0.beta1'
+gem 'rspec', '~> 3.13'
+gem 'rake', '~> 13.2'
 gem 'json'
 gem 'test-unit'
 
@@ -11,7 +11,7 @@ platform :jruby do
 end
 
 platform :ruby do
-  gem 'sqlite3', '~> 1.3.0'
+  gem 'sqlite3'
 end
 
 gemspec :path => '../'