diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index 64bdc234..2a6eeb7a 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -45,20 +45,17 @@ jobs: name: Rails Specs strategy: matrix: - rails: ['7.0', '7.1', '7.2', '8.0'] + rails: ['7.2', '8.0', '8.1'] include: - - rails: '7.0' - ruby: '3.1' - gemfile: gemfiles/rails_7_0.gemfile - - rails: '7.1' - ruby: '3.2' - gemfile: gemfiles/rails_7_1.gemfile - rails: '7.2' - ruby: '3.3' + ruby: '3.2' gemfile: gemfiles/rails_7_2.gemfile - rails: '8.0' - ruby: '3.4' + ruby: '3.3' gemfile: gemfiles/rails_8_0.gemfile + - rails: '8.1' + ruby: '3.4' + gemfile: gemfiles/rails_8_1.gemfile runs-on: ubuntu-latest env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} diff --git a/Appraisals b/Appraisals index 22bc38be..cc719ac3 100644 --- a/Appraisals +++ b/Appraisals @@ -1,15 +1,3 @@ -appraise 'rails_7_0' do - group :test do - gem 'activejob', '~> 7.0' - end -end - -appraise 'rails_7_1' do - group :test do - gem 'activejob', '~> 7.1' - end -end - appraise 'rails_7_2' do group :test do gem 'activejob', '~> 7.2' @@ -21,3 +9,9 @@ appraise 'rails_8_0' do gem 'activejob', '~> 8.0' end end + +appraise 'rails_8_1' do + group :test do + gem 'activejob', '~> 8.1' + end +end diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e9767bc..c69008a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ## [7.0.0] - Unreleased +- Breaking: Remove support for Rails versions older than 7.2 + - Rails 7.0 and 7.1 have reached end-of-life and are no longer supported + - Supported versions: Rails 7.2, 8.0, and 8.1 + - Users on older Rails versions should upgrade or remain on Shoryuken 6.x + - Enhancement: Replace Concurrent::AtomicFixnum with pure Ruby AtomicCounter - Removes external dependency on concurrent-ruby for atomic fixnum operations - Introduces Shoryuken::Helpers::AtomicCounter as a thread-safe alternative using Mutex diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile deleted file mode 100644 index ebd3b410..00000000 --- a/gemfiles/rails_7_0.gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# This file was generated by Appraisal - -source 'https://rubygems.org' - -group :test do - gem 'activejob', '~> 7.0' - gem 'httparty' - gem 'multi_xml' - gem 'simplecov' - gem 'warning' -end - -group :development do - gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git' - gem 'pry-byebug' - gem 'rubocop' -end - -gemspec path: '../' diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile deleted file mode 100644 index 8f763318..00000000 --- a/gemfiles/rails_7_1.gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# This file was generated by Appraisal - -source 'https://rubygems.org' - -group :test do - gem 'activejob', '~> 7.1' - gem 'httparty' - gem 'multi_xml' - gem 'simplecov' - gem 'warning' -end - -group :development do - gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git' - gem 'pry-byebug' - gem 'rubocop' -end - -gemspec path: '../' diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile index c26a8019..6f39f0a0 100644 --- a/gemfiles/rails_7_2.gemfile +++ b/gemfiles/rails_7_2.gemfile @@ -1,19 +1,19 @@ # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" group :test do - gem 'activejob', '~> 7.2' - gem 'httparty' - gem 'multi_xml' - gem 'simplecov' - gem 'warning' + gem "activejob", "~> 7.2" + gem "httparty" + gem "multi_xml" + gem "simplecov" + gem "warning" end group :development do - gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git' - gem 'pry-byebug' - gem 'rubocop' + gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git" + gem "pry-byebug" + gem "rubocop" end -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile index bc83dd8e..061b03ad 100644 --- a/gemfiles/rails_8_0.gemfile +++ b/gemfiles/rails_8_0.gemfile @@ -1,19 +1,19 @@ # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" group :test do - gem 'activejob', '~> 8.0' - gem 'httparty' - gem 'multi_xml' - gem 'simplecov' - gem 'warning' + gem "activejob", "~> 8.0" + gem "httparty" + gem "multi_xml" + gem "simplecov" + gem "warning" end group :development do - gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git' - gem 'pry-byebug' - gem 'rubocop' + gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git" + gem "pry-byebug" + gem "rubocop" end -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_8_1.gemfile b/gemfiles/rails_8_1.gemfile new file mode 100644 index 00000000..e7471ec0 --- /dev/null +++ b/gemfiles/rails_8_1.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +group :test do + gem "activejob", "~> 8.1" + gem "httparty" + gem "multi_xml" + gem "simplecov" + gem "warning" +end + +group :development do + gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git" + gem "pry-byebug" + gem "rubocop" +end + +gemspec path: "../"