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
37 changes: 32 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,35 +65,62 @@ workflows:
- gemfiles/rails5.2_graphql1.11.gemfile
- gemfiles/rails6.0_graphql1.11.gemfile
- gemfiles/rails6.0_graphql1.12.gemfile
- gemfiles/rails6.0_graphql1.13.gemfile
- gemfiles/rails6.1_graphql1.11.gemfile
- gemfiles/rails6.1_graphql1.12.gemfile
- gemfiles/rails7.0_graphql1.11.gemfile
- gemfiles/rails7.0_graphql1.12.gemfile
- gemfiles/rails6.1_graphql1.13.gemfile
# - gemfiles/rails7.0_graphql1.11.gemfile
# - gemfiles/rails7.0_graphql1.12.gemfile
# - gemfiles/rails7.0_graphql1.13.gemfile
exclude:
- 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/rails7.0_graphql1.11.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
- ruby-version: '2.3'
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- ruby-version: '2.4'
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
gemfile: gemfiles/rails6.1_graphql1.13.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.5'
# gemfile: gemfiles/rails7.0_graphql1.11.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.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.7'
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
- ruby-version: '3.0'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ README.md.*
# rvm config files
.ruby-version
.ruby-gemset
.tool-versions

.env
/spec/tmp/config/routes.rb
43 changes: 20 additions & 23 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,6 @@ appraise 'rails5.2-graphql1.12' do
gem 'rspec-rails', '< 4.0'
end

appraise 'rails6.0-graphql1.8' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'rails', github: 'rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.8.0'
end

appraise 'rails6.0-graphql1.9' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'rails', github: 'rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.9.0'
end

appraise 'rails6.0-graphql1.10' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
Expand All @@ -117,11 +103,11 @@ appraise 'rails6.0-graphql1.12' do
gem 'graphql', '~> 1.12.0'
end

appraise 'rails6.1-graphql1.9' do
appraise 'rails6.0-graphql1.13' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'rails', github: 'rails/rails', branch: '6-1-stable'
gem 'graphql', '~> 1.9.0'
gem 'rails', github: 'rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.13.0'
end

appraise 'rails6.1-graphql1.10' do
Expand All @@ -145,42 +131,53 @@ appraise 'rails6.1-graphql1.12' do
gem 'graphql', '~> 1.12.0'
end

appraise 'rails6.1-graphql_edge' do
appraise 'rails6.1-graphql1.13' do
gem 'sqlite3', '~> 1.4'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise', '>= 4.7'
gem 'rails', github: 'rails/rails', branch: '6-1-stable'
gem 'graphql', github: 'rmosolgo/graphql-ruby', branch: 'master'
gem 'graphql', '~> 1.13.0'
end

appraise 'rails7.0-graphql1.9' do
appraise 'rails6.1-graphql_edge' do
gem 'sqlite3', '~> 1.4'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
gem 'devise', '>= 4.7'
gem 'rails', github: 'rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.9.0'
gem 'rails', github: 'rails/rails', branch: '6-1-stable'
gem 'graphql', github: 'rmosolgo/graphql-ruby', branch: 'master'
end

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

appraise 'rails7.0-graphql1.11' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
gem 'rails', github: 'rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.11.0'
end

appraise 'rails7.0-graphql1.12' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
gem 'rails', github: 'rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.12.0'
end

appraise 'rails7.0-graphql1.13' do
gem 'sqlite3', '~> 1.4'
gem 'devise', '>= 4.7'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
gem 'rails', github: 'rails/rails', branch: '7-0-stable'
gem 'graphql', '~> 1.13.0'
end

appraise 'rails7.0-graphql_edge' do
gem 'sqlite3', '~> 1.4'
gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ source "https://rubygems.org"
gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "rails", github: "rails/rails", branch: "6-0-stable"
gem "graphql", "~> 1.8.0"
gem "graphql", "~> 1.13.0"

gemspec path: "../"
10 changes: 0 additions & 10 deletions gemfiles/rails6.0_graphql1.9.gemfile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ source "https://rubygems.org"
gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "rails", github: "rails/rails", branch: "6-1-stable"
gem "graphql", "~> 1.9.0"
gem "graphql", "~> 1.13.0"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails7.0_graphql1.10.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "https://rubygems.org"

gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", github: "lynndylanhurley/devise_token_auth", branch: "master"
gem "rails", github: "rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.10.0"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails7.0_graphql1.11.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "https://rubygems.org"

gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", github: "lynndylanhurley/devise_token_auth", branch: "master"
gem "rails", github: "rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.11.0"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails7.0_graphql1.12.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "https://rubygems.org"

gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", github: "lynndylanhurley/devise_token_auth", branch: "master"
gem "rails", github: "rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.12.0"

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

gem "sqlite3", "~> 1.4"
gem "devise", ">= 4.7"
gem "devise_token_auth", github: "lynndylanhurley/devise_token_auth", branch: "master"
gem "rails", github: "rails/rails", branch: "7-0-stable"
gem "graphql", "~> 1.9.0"
gem "graphql", "~> 1.13.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion graphql_devise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.3.0'

spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
spec.add_dependency 'graphql', '>= 1.8', '< 1.13.0'
spec.add_dependency 'graphql', '>= 1.8', '< 1.14.0'
spec.add_dependency 'rails', '>= 4.2', '< 7.1'

spec.add_development_dependency 'appraisal'
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@
config.active_support.deprecation = :stderr

# Raises error for missing translations
config.action_view.raise_on_missing_translations = true
config.action_view.raise_on_missing_translations = true if Rails::VERSION::MAJOR < 7
end