Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,35 +69,11 @@ workflows:
- gemfiles/rails6.1_graphql1.12.gemfile
- gemfiles/rails6.1_graphql1.13.gemfile
- gemfiles/rails6.1_graphql2.0.gemfile
- gemfiles/rails7.0_graphql1.11.gemfile
- gemfiles/rails7.0_graphql1.12.gemfile
- gemfiles/rails7.0_graphql1.13.gemfile
- gemfiles/rails7.0_graphql2.0.gemfile
exclude:
- ruby-version: '2.2'
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
- ruby-version: '2.2'
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
- ruby-version: '2.4'
Expand All @@ -112,10 +88,34 @@ workflows:
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
- 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/rails7.0_graphql2.0.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.7'
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
- ruby-version: '3.0'
Expand Down
21 changes: 6 additions & 15 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,11 @@ appraise 'rails6.1-graphql2.0' do
gem 'graphql', '~> 2.0.1'
end

appraise 'rails7.0-graphql1.10' do
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.10.0'
end

appraise 'rails7.0-graphql1.11' do
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise_token_auth', '>= 1.2.1'
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.11.0'
end
Expand All @@ -167,7 +158,7 @@ appraise 'rails7.0-graphql1.12' do
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise_token_auth', '>= 1.2.1'
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.12.0'
end
Expand All @@ -176,16 +167,16 @@ appraise 'rails7.0-graphql1.13' do
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise_token_auth', '>= 1.2.1'
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.13.0'
end

appraise 'rails7.0-graphql_edge' do
appraise 'rails7.0-graphql2.0' do
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise_token_auth', '>= 1.2.1'
gem 'devise', '>= 4.7'
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
gem 'graphql', git: 'https://github.com/rmosolgo/graphql-ruby', branch: 'master'
gem 'graphql', '~> 2.0.1'
end
2 changes: 1 addition & 1 deletion gemfiles/rails7.0_graphql1.11.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "sassc-rails"
gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
gem "devise_token_auth", ">= 1.2.1"
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.11.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails7.0_graphql1.12.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "sassc-rails"
gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
gem "devise_token_auth", ">= 1.2.1"
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.12.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails7.0_graphql1.13.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "sassc-rails"
gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
gem "devise_token_auth", ">= 1.2.1"
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.13.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ source "https://rubygems.org"

gem "sassc-rails"
gem "sqlite3", "~> 1.4"
gem "devise_token_auth", ">= 1.2.1"
gem "devise", ">= 4.7"
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.10.0"
gem "graphql", "~> 2.0.1"

gemspec path: "../"
12 changes: 0 additions & 12 deletions gemfiles/rails7.0_graphql_edge.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion graphql_devise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
spec.add_dependency 'graphql', '>= 1.8', '< 2.1'
spec.add_dependency 'rails', '>= 4.2', '< 6.2'
spec.add_dependency 'rails', '>= 4.2', '< 7.1'
spec.add_dependency 'zeitwerk'

spec.add_development_dependency 'appraisal'
Expand Down