diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6bb6973..e38f016 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,8 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7'] - rails: ['5.2', '6.1', '7.1'] + ruby: ['2.7', '3.0'] + rails: ['6.1', '7.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: diff --git a/.rubocop.yml b/.rubocop.yml index be79a7f..0506775 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,7 +13,7 @@ AllCops: SuggestExtensions: false DisplayCopNames: true TargetRubyVersion: 2.7 - TargetRailsVersion: 5.2 + TargetRailsVersion: 6.1 Exclude: - bin/**/* - vendor/**/* diff --git a/Appraisals b/Appraisals index 15aa0af..14cdee6 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,5 @@ # frozen_string_literal: true -appraise 'rails-5.2' do - gem 'activejob', '~> 5.2.0' - gem 'activerecord', '~> 5.2.0' - gem 'activesupport', '~> 5.2.0' -end - appraise 'rails-6.1' do gem 'activejob', '~> 6.1.0' gem 'activerecord', '~> 6.1.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index a22f74c..ad5c257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Raised minimum supported Ruby/Rails version to 2.7/6.1 (#16) ### 2.5.0 (4 October 2024) diff --git a/Gemfile b/Gemfile index 84eba7a..5e31dc6 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'countless', '~> 1.1' gem 'guard-rspec', '~> 4.7' gem 'rack', '~> 2.2' gem 'rack-test', '~> 2.0' -gem 'railties', '>= 5.2' +gem 'railties', '>= 6.1' gem 'rake', '~> 13.0' gem 'rspec', '~> 3.12' gem 'rubocop', '~> 1.28' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 6296e29..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,27 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4" -gem "bundler", "~> 2.3" -gem "countless", "~> 1.1" -gem "guard-rspec", "~> 4.7" -gem "rack", "~> 2.2" -gem "rack-test", "~> 2.0" -gem "railties", ">= 5.2" -gem "rake", "~> 13.0" -gem "rspec", "~> 3.12" -gem "rubocop", "~> 1.28" -gem "rubocop-rails", "~> 2.14" -gem "rubocop-rspec", "~> 2.10" -gem "simplecov", ">= 0.22" -gem "timecop", ">= 0.9.6" -gem "vcr", "~> 6.0" -gem "webmock", "~> 3.18" -gem "yard", ">= 0.9.28" -gem "yard-activesupport-concern", ">= 0.0.1" -gem "activejob", "~> 5.2.0" -gem "activerecord", "~> 5.2.0" -gem "activesupport", "~> 5.2.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 63ff789..92858f6 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -8,7 +8,7 @@ gem "countless", "~> 1.1" gem "guard-rspec", "~> 4.7" gem "rack", "~> 2.2" gem "rack-test", "~> 2.0" -gem "railties", ">= 5.2" +gem "railties", ">= 6.1" gem "rake", "~> 13.0" gem "rspec", "~> 3.12" gem "rubocop", "~> 1.28" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 983fe53..a4b6113 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -8,7 +8,7 @@ gem "countless", "~> 1.1" gem "guard-rspec", "~> 4.7" gem "rack", "~> 2.2" gem "rack-test", "~> 2.0" -gem "railties", ">= 5.2" +gem "railties", ">= 6.1" gem "rake", "~> 13.0" gem "rspec", "~> 3.12" gem "rubocop", "~> 1.28" diff --git a/grape-jwt-authentication.gemspec b/grape-jwt-authentication.gemspec index 233ec48..abec391 100644 --- a/grape-jwt-authentication.gemspec +++ b/grape-jwt-authentication.gemspec @@ -33,10 +33,10 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7' - spec.add_runtime_dependency 'activesupport', '>= 5.2' - spec.add_runtime_dependency 'grape', '>= 1.0', '< 3.0' - spec.add_runtime_dependency 'httparty', '>= 0.21' - spec.add_runtime_dependency 'jwt', '~> 2.6' - spec.add_runtime_dependency 'keyless', '~> 1.4' - spec.add_runtime_dependency 'recursive-open-struct', '~> 2.0' + spec.add_dependency 'activesupport', '>= 6.1' + spec.add_dependency 'grape', '>= 1.0', '< 3.0' + spec.add_dependency 'httparty', '>= 0.21' + spec.add_dependency 'jwt', '~> 2.6' + spec.add_dependency 'keyless', '~> 1.4' + spec.add_dependency 'recursive-open-struct', '~> 2.0' end