Skip to content

Drop support for Rails < 6.0 and Ruby < 2.7 #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcelicalderon merged 3 commits into from
Nov 21, 2024
Merged

Drop support for Rails < 6.0 and Ruby < 2.7 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b983656
Drop support for Rails < 6.0, Ruby < 2.7.
HeyNonster Nov 9, 2024
8ffc985
Bump `pry` requirement.
HeyNonster Nov 9, 2024
a822e59
Test with Ruby 3.1, 3.2, 3.3
HeyNonster Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 9 additions & 89 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
RUBYOPT: '-rostruct'
steps:
- checkout
- run: gem install bundler -v '1.17'
- run: gem install bundler -v '2.4.22'
- run:
name: Install dependencies
command: bundle install
Expand All @@ -40,20 +40,12 @@ workflows:
matrix:
parameters:
ruby-version:
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
gemfile:
- gemfiles/rails4.2_graphql1.8.gemfile
- gemfiles/rails5.0_graphql1.8.gemfile
- gemfiles/rails5.0_graphql1.9.gemfile
- gemfiles/rails5.1_graphql1.8.gemfile
- gemfiles/rails5.1_graphql1.9.gemfile
- gemfiles/rails5.2_graphql1.8.gemfile
- gemfiles/rails5.2_graphql1.9.gemfile
- gemfiles/rails5.2_graphql1.10.gemfile
- gemfiles/rails5.2_graphql1.11.gemfile
- gemfiles/rails6.0_graphql1.11.gemfile
- gemfiles/rails6.0_graphql1.12.gemfile
- gemfiles/rails6.0_graphql1.13.gemfile
Expand All @@ -73,84 +65,12 @@ workflows:
- gemfiles/rails7.1_graphql2.2.gemfile
- gemfiles/rails7.1_graphql2.3.gemfile
exclude:
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
- ruby-version: '2.5'
- ruby-version: '3.3'
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql2.1.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql2.2.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.0_graphql2.3.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.1_graphql2.0.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.1_graphql2.1.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.1_graphql2.2.gemfile
- ruby-version: '2.5'
gemfile: gemfiles/rails7.1_graphql2.3.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql2.1.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql2.2.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.0_graphql2.3.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.1_graphql2.0.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.1_graphql2.1.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.1_graphql2.2.gemfile
- ruby-version: '2.6'
gemfile: gemfiles/rails7.1_graphql2.3.gemfile
- ruby-version: '2.7'
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.0_graphql1.8.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.0_graphql1.9.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.1_graphql1.8.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.1_graphql1.9.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.2_graphql1.8.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.2_graphql1.9.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.2_graphql1.10.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails5.2_graphql1.11.gemfile
- ruby-version: '3.3'
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
- ruby-version: '3.3'
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
- report-coverage:
requires:
- test
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require:
- rubocop-rails

AllCops:
TargetRubyVersion: 2.4.4
TargetRubyVersion: 2.7
DisplayCopNames: true
Exclude:
- bin/**/*
Expand Down
95 changes: 0 additions & 95 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,3 @@
appraise 'rails4.2-graphql1.8' do
gem 'sqlite3', '~> 1.3.6'
gem 'bundler', '~> 1.17'
gem 'rails', git: 'https://github.com/rails/rails', branch: '4-2-stable'
gem 'graphql', '~> 1.8.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'bigdecimal', '1.3.5'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.0-graphql1.8' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-0-stable'
gem 'graphql', '~> 1.8.0'
gem 'devise_token_auth', '0.1.43'
gem 'devise', '>= 4.0'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.0-graphql1.9' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-0-stable'
gem 'graphql', '~> 1.9.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.1-graphql1.8' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-1-stable'
gem 'graphql', '~> 1.8.0'
gem 'devise_token_auth', '0.1.43'
gem 'devise', '>= 4.3'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.1-graphql1.9' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-1-stable'
gem 'graphql', '~> 1.9.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.2-graphql1.8' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
gem 'graphql', '~> 1.8.0'
gem 'devise_token_auth', '0.1.43'
gem 'devise', '>= 4.4.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.2-graphql1.9' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
gem 'graphql', '~> 1.9.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.2-graphql1.10' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
gem 'graphql', '~> 1.10.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.2-graphql1.11' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
gem 'graphql', '~> 1.11.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails5.2-graphql1.12' do
gem 'sqlite3', '~> 1.3.6'
gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
gem 'graphql', '~> 1.12.0'
gem 'devise_token_auth', '< 1.2'
gem 'rspec-rails', '< 4.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails6.0-graphql1.10' do
gem 'sqlite3', '~> 1.5.4'
gem 'devise', '>= 4.7'
Expand Down
6 changes: 1 addition & 5 deletions app/controllers/graphql_devise/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# frozen_string_literal: true

module GraphqlDevise
ApplicationController = if Rails::VERSION::MAJOR >= 5
Class.new(ActionController::API)
else
Class.new(ActionController::Base)
end
ApplicationController = Class.new(ActionController::API)
end
14 changes: 0 additions & 14 deletions gemfiles/rails4.2_graphql1.8.gemfile
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/rails5.0_graphql1.8.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.0_graphql1.9.gemfile
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/rails5.1_graphql1.8.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.1_graphql1.9.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.2_graphql1.10.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.2_graphql1.11.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.2_graphql1.12.gemfile
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/rails5.2_graphql1.8.gemfile
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails5.2_graphql1.9.gemfile
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions graphql_devise.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Gem::Specification.new do |spec|
`git ls-files -z`.split("\x0").select { |f| f.match(%r{^spec/}) }
end

spec.required_ruby_version = '>= 2.4.4'
spec.required_ruby_version = '>= 2.7.0'

spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
spec.add_dependency 'graphql', '>= 1.8', '< 2.4'
spec.add_dependency 'rails', '>= 4.2', '< 7.2'
spec.add_dependency 'rails', '>= 6.0', '< 7.2'
spec.add_dependency 'zeitwerk'

spec.add_development_dependency 'appraisal'
Expand All @@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'faker'
spec.add_development_dependency 'generator_spec'
spec.add_development_dependency 'github_changelog_generator'
spec.add_development_dependency 'pry', '~> 0.12.2'
spec.add_development_dependency 'pry', '>= 0.14.2'
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'rake', '>= 12.3.3'
spec.add_development_dependency 'rspec-rails', '~> 4.0'
Expand Down
Loading