Add support for graphql 1.13

graphql-devise · Feb 7, 2022 · 37109c2 · 37109c2
1 parent e9c9a8f
commit 37109c2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -66,8 +66,10 @@ 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/rails6.1_graphql1.13.gemfile
             exclude:
               - ruby-version: '2.2'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
@@ -81,18 +83,26 @@ workflows:
                 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.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/rails6.1_graphql1.13.gemfile
               - ruby-version: '2.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ README.md.*
 # rvm config files
 .ruby-version
 .ruby-gemset
+.tool-versions
 
 .env
 /spec/tmp/config/routes.rb
diff --git a/Appraisals b/Appraisals
@@ -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'
@@ -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
@@ -145,6 +131,13 @@ appraise 'rails6.1-graphql1.12' do
   gem 'graphql', '~> 1.12.0'
 end
 
+appraise 'rails6.1-graphql1.13' do
+  gem 'sqlite3', '~> 1.4'
+  gem 'devise', '>= 4.7'
+  gem 'rails', github: 'rails/rails', branch: '6-1-stable'
+  gem 'graphql', '~> 1.13.0'
+end
+
 appraise 'rails6.1-graphql_edge' do
   gem 'sqlite3', '~> 1.4'
   gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'

diff --git a/gemfiles/rails6.0_graphql1.8.gemfile → gemfiles/rails6.0_graphql1.13.gemfile b/gemfiles/rails6.0_graphql1.8.gemfile → gemfiles/rails6.0_graphql1.13.gemfile
@@ -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: "../"
diff --git a/gemfiles/rails6.0_graphql1.9.gemfile b/gemfiles/rails6.0_graphql1.9.gemfile
diff --git a/gemfiles/rails6.1_graphql1.9.gemfile → gemfiles/rails6.1_graphql1.13.gemfile b/gemfiles/rails6.1_graphql1.9.gemfile → gemfiles/rails6.1_graphql1.13.gemfile
@@ -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: "../"
diff --git a/graphql_devise.gemspec b/graphql_devise.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.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', '< 6.2'
 
   spec.add_development_dependency 'appraisal'

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -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