Skip to content

Commit

Permalink
Align ruby and rails support with the main doorkeeper gem
Browse files Browse the repository at this point in the history
  • Loading branch information
jmortlock committed Aug 23, 2022
1 parent 3162a80 commit 3a8701c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
3.1.2
2 changes: 1 addition & 1 deletion doorkeeper-openid_connect.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.5'
spec.required_ruby_version = '>= 2.6'

spec.add_runtime_dependency 'doorkeeper', '>= 5.5', '< 5.7'
spec.add_runtime_dependency 'json-jwt', '>= 1.11.0'
Expand Down
13 changes: 7 additions & 6 deletions spec/dummy/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
#
default: &default
development:
adapter: sqlite3
pool: 5
timeout: 5000

development:
<<: *default
database: db/development.sqlite3

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
adapter: sqlite3
pool: 5
timeout: 5000
database: db/test.sqlite3

production:
<<: *default
adapter: sqlite3
pool: 5
timeout: 5000
database: db/production.sqlite3
19 changes: 0 additions & 19 deletions spec/dummy/config/initializers/new_framework_defaults.rb

This file was deleted.

3 changes: 0 additions & 3 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
ActiveRecord::Migration.maintain_test_schema!
end

# Remove after dropping support of Rails 4.2
require_relative 'support/http_method_shim.rb'

require_relative 'support/doorkeeper_configuration.rb'

require 'factory_bot'
Expand Down
36 changes: 0 additions & 36 deletions spec/support/http_method_shim.rb

This file was deleted.

0 comments on commit 3a8701c

Please sign in to comment.