diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d221c096..fa80824a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,6 @@ jobs: exclude: - ruby: 3.0 gemfile: gemfiles/rails_5_2.gemfile - - ruby: 2.6 - gemfile: gemfiles/rails_7_0.gemfile steps: - name: Repo checkout uses: actions/checkout@v3 diff --git a/.rubocop.yml b/.rubocop.yml index 143e90787..1f0284def 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ require: - rubocop-rails - rubocop-rspec AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Exclude: - "spec/generators/tmp/**/*" - "spec/dummy/db/*" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb7b553b..2108ad099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ User-visible changes worth mentioning. ## main - [#ID] Add your PR description here. +- [#1622] Drop support for Rubies 2.5 and 2.6 - [#1605] Fix URI validation for Ruby 3.2+. ## 5.6.2 diff --git a/doorkeeper.gemspec b/doorkeeper.gemspec index 55d6ebf61..c24f40ec7 100644 --- a/doorkeeper.gemspec +++ b/doorkeeper.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |gem| } gem.add_dependency "railties", ">= 5" - gem.required_ruby_version = ">= 2.5" + gem.required_ruby_version = ">= 2.7" gem.post_install_message = <<~MSG.strip Starting from 5.5.0 RC1 Doorkeeper requires client authentication for Resource Owner Password Grant