Silence graphql_definition deprecation warning before suporting GQL 2.0 (#217)

* Silence graphql_definition deprecation warning before suporting GQL 2.0

* Only silence deprecation warning if graphql >= 1.13.1

The »silence_deprecation_warning»-param was introduced with v1.13.1

See rmosolgo/graphql-ruby@3d1c24a

* Add support for graphql 1.13

This is a cherry-picked version of 5642ca9 excluding the rails-7 related changes.

* Temp skip ruby 2.5 rails 6 GQL 1.13

Cherry-picked 502c555

* Skip ruby 2.2 rails 6 GQL 1.13

GQL 1.13 reuires ruby 2.4

Co-authored-by: Mario Celi <mcelicalderon@gmail.com>

Author: janraasch

.circleci/config.yml

@@ -66,33 +66,51 @@ 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
               - 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.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.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.5'
+                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
+              - ruby-version: '2.5'
+                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
               - ruby-version: '2.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

.gitignore

@@ -24,6 +24,7 @@ README.md.*
 # rvm config files
 .ruby-version
 .ruby-gemset
+.tool-versions
 
 .env
 /spec/tmp/config/routes.rb

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,10 +131,9 @@ 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

gemfiles/rails6.0_graphql1.8.gemfile gemfiles/rails6.0_graphql1.13.gemfilegemfiles/rails6.0_graphql1.8.gemfile renamed to 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: "../"

gemfiles/rails6.0_graphql1.9.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: "../"

gemfiles/rails6.1_graphql1.9.gemfile gemfiles/rails6.1_graphql1.13.gemfilegemfiles/rails6.1_graphql1.9.gemfile renamed to gemfiles/rails6.1_graphql1.13.gemfile

@@ -113,7 +113,11 @@ def authenticate_option(field, trace_data)
       auth_required = if trace_data[:context]
         field.metadata[:authenticate]
       else
-        field.graphql_definition.metadata[:authenticate]
+        if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.13.1')
+          field.graphql_definition(silence_deprecation_warning: true).metadata[:authenticate]
+        else
+          field.graphql_definition.metadata[:authenticate]
+        end
       end
 
       auth_required.nil? ? @authenticate_default : auth_required