Merge pull request #257 from graphql-devise/add-graphql-2.1-support

Support graphql v2.1
graphql-devise · Sep 1, 2023 · 4ffeeeb · 4ffeeeb
2 parents ba5f275 + 087dd98
commit 4ffeeeb
Show file tree

Hide file tree

Showing 18 changed files with 75 additions and 39 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,6 @@ workflows:
           matrix:
             parameters:
               ruby-version:
-                - '2.4'
                 - '2.5'
                 - '2.6'
                 - '2.7'
@@ -65,6 +64,7 @@ workflows:
                 - gemfiles/rails7.0_graphql1.12.gemfile
                 - gemfiles/rails7.0_graphql1.13.gemfile
                 - gemfiles/rails7.0_graphql2.0.gemfile
+                - gemfiles/rails7.0_graphql2.1.gemfile
             exclude:
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
@@ -88,6 +88,8 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql1.13.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails7.0_graphql2.0.gemfile
+              - ruby-version: '2.4'
+                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
               - ruby-version: '2.5'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.5'
@@ -100,6 +102,18 @@ workflows:
                 gemfile: gemfiles/rails7.0_graphql1.13.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/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'
+                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
               - ruby-version: '2.6'
                 gemfile: gemfiles/rails7.0_graphql1.11.gemfile
               - ruby-version: '2.6'
@@ -108,6 +122,8 @@ workflows:
                 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.7'
                 gemfile: gemfiles/rails4.2_graphql1.8.gemfile
               - ruby-version: '3.0'

diff --git a/Appraisals b/Appraisals
@@ -83,71 +83,76 @@ appraise 'rails5.2-graphql1.12' do
 end
 
 appraise 'rails6.0-graphql1.10' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.10.0'
 end
 
 appraise 'rails6.0-graphql1.11' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.11.0'
 end
 
 appraise 'rails6.0-graphql1.12' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.12.0'
 end
 
 appraise 'rails6.0-graphql1.13' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.13.0'
 end
 
 appraise 'rails6.1-graphql1.10' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.10.0'
 end
 
 appraise 'rails6.1-graphql1.11' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.11.0'
 end
 
 appraise 'rails6.1-graphql1.12' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.12.0'
 end
 
 appraise 'rails6.1-graphql1.13' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.13.0'
 end
 
 appraise 'rails6.1-graphql2.0' do
-  gem 'sqlite3', '~> 1.4'
+  gem 'public_suffix', '< 5'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 2.0.1'
 end
 
 appraise 'rails7.0-graphql1.11' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -156,7 +161,7 @@ end
 
 appraise 'rails7.0-graphql1.12' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -165,7 +170,7 @@ end
 
 appraise 'rails7.0-graphql1.13' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -174,9 +179,18 @@ end
 
 appraise 'rails7.0-graphql2.0' do
   gem 'sassc-rails'
-  gem 'sqlite3', '~> 1.4'
+  gem 'sqlite3', '~> 1.5.4'
   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', '~> 2.0.1'
 end
+
+appraise 'rails7.0-graphql2.1' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  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', '>= 2.1', '< 2.2'
+end
diff --git a/gemfiles/rails6.0_graphql1.10.gemfile b/gemfiles/rails6.0_graphql1.10.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.10.0"

diff --git a/gemfiles/rails6.0_graphql1.11.gemfile b/gemfiles/rails6.0_graphql1.11.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
+gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.11.0"

diff --git a/gemfiles/rails6.0_graphql1.12.gemfile b/gemfiles/rails6.0_graphql1.12.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
+gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.12.0"

diff --git a/gemfiles/rails6.0_graphql1.13.gemfile b/gemfiles/rails6.0_graphql1.13.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
 gem "graphql", "~> 1.13.0"

diff --git a/gemfiles/rails6.1_graphql1.10.gemfile b/gemfiles/rails6.1_graphql1.10.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.10.0"

diff --git a/gemfiles/rails6.1_graphql1.11.gemfile b/gemfiles/rails6.1_graphql1.11.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
+gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.11.0"

diff --git a/gemfiles/rails6.1_graphql1.12.gemfile b/gemfiles/rails6.1_graphql1.12.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
+gem "public_suffix", "< 5"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.12.0"

diff --git a/gemfiles/rails6.1_graphql1.13.gemfile b/gemfiles/rails6.1_graphql1.13.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 1.13.0"

diff --git a/gemfiles/rails6.1_graphql2.0.gemfile b/gemfiles/rails6.1_graphql2.0.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.4"
+gem "public_suffix", "< 5"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
 gem "graphql", "~> 2.0.1"

diff --git a/gemfiles/rails6.1_graphql_edge.gemfile b/gemfiles/rails6.1_graphql_edge.gemfile
diff --git a/gemfiles/rails7.0_graphql1.11.gemfile b/gemfiles/rails7.0_graphql1.11.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sassc-rails"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "devise_token_auth", ">= 1.2.1"
 gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"

diff --git a/gemfiles/rails7.0_graphql1.12.gemfile b/gemfiles/rails7.0_graphql1.12.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sassc-rails"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "devise_token_auth", ">= 1.2.1"
 gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"

diff --git a/gemfiles/rails7.0_graphql1.13.gemfile b/gemfiles/rails7.0_graphql1.13.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sassc-rails"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise", ">= 4.7"
 gem "devise_token_auth", ">= 1.2.1"
 gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"

diff --git a/gemfiles/rails7.0_graphql2.0.gemfile b/gemfiles/rails7.0_graphql2.0.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "sassc-rails"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.5.4"
 gem "devise_token_auth", ">= 1.2.1"
 gem "devise", ">= 4.7"
 gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"

diff --git a/gemfiles/rails7.0_graphql2.1.gemfile b/gemfiles/rails7.0_graphql2.1.gemfile
@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sassc-rails"
+gem "sqlite3", "~> 1.5.4"
+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", ">= 2.1", "< 2.2"
+
+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.4.4'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 2.1'
+  spec.add_dependency 'graphql', '>= 1.8', '< 2.2'
   spec.add_dependency 'rails', '>= 4.2', '< 7.1'
   spec.add_dependency 'zeitwerk'