Merge pull request #146 from doorkeeper-gem/require-ruby-2-5

Require at least Ruby 2.5
doorkeeper-gem · Apr 20, 2021 · 23f94f5 · 23f94f5
2 parents 036deb3 + 5e6b05c
commit 23f94f5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
   - rubocop-rails
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   Exclude:
     - "spec/dummy/bin/*"
     - "spec/dummy/db/*"

diff --git a/.travis.yml b/.travis.yml
@@ -22,23 +22,11 @@ gemfile:
   - gemfiles/doorkeeper_master.gemfile
 
 rvm:
-  - 2.4
   - 2.5
   - 2.6
   - 2.7
 
 matrix:
-  exclude:
-    - gemfile: gemfiles/rails_6.0.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/rails_master.gemfile
-      rvm: 2.4
-    - gemfile: gemfiles/rails_6.0.gemfile
-      rvm: 2.4
-      arch: ppc64le
-    - gemfile: gemfiles/rails_master.gemfile
-      rvm: 2.4
-      arch: ppc64le
   allow_failures:
     - gemfile: gemfiles/rails_master.gemfile
     - gemfile: gemfiles/doorkeeper_master.gemfile

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Unreleased
 
 - [#138] Support form_post response mode (This gem now requires Doorkeeper v5.5)
+- [#146] Require at least Ruby 2.5
 
 ## v1.7.5 (2020-12-15)
 

diff --git a/doorkeeper-openid_connect.gemspec b/doorkeeper-openid_connect.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.add_runtime_dependency 'doorkeeper', '>= 5.5', '< 5.6'
   spec.add_runtime_dependency 'json-jwt', '>= 1.11.0'