Skip to content

Commit 4ffeeeb

Browse files
mcelicalderonmcelicalderon
authored
Merge pull request #257 from graphql-devise/add-graphql-2.1-support
Support graphql v2.1
2 parents ba5f275 + 087dd98 commit 4ffeeeb

18 files changed

Lines changed: 75 additions & 39 deletions

‎.circleci/config.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ workflows:
3939
matrix:
4040
parameters:
4141
ruby-version:
42-
- '2.4'
4342
- '2.5'
4443
- '2.6'
4544
- '2.7'
@@ -65,6 +64,7 @@ workflows:
6564
- gemfiles/rails7.0_graphql1.12.gemfile
6665
- gemfiles/rails7.0_graphql1.13.gemfile
6766
- gemfiles/rails7.0_graphql2.0.gemfile
67+
- gemfiles/rails7.0_graphql2.1.gemfile
6868
exclude:
6969
- ruby-version: '2.4'
7070
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
@@ -88,6 +88,8 @@ workflows:
8888
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
8989
- ruby-version: '2.4'
9090
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
91+
- ruby-version: '2.4'
92+
gemfile: gemfiles/rails7.0_graphql2.1.gemfile
9193
- ruby-version: '2.5'
9294
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
9395
- ruby-version: '2.5'
@@ -100,6 +102,18 @@ workflows:
100102
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
101103
- ruby-version: '2.5'
102104
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
105+
- ruby-version: '2.5'
106+
gemfile: gemfiles/rails7.0_graphql2.1.gemfile
107+
- ruby-version: '2.5'
108+
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
109+
- ruby-version: '2.5'
110+
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
111+
- ruby-version: '2.5'
112+
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
113+
- ruby-version: '2.5'
114+
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
115+
- ruby-version: '2.5'
116+
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
103117
- ruby-version: '2.6'
104118
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
105119
- ruby-version: '2.6'
@@ -108,6 +122,8 @@ workflows:
108122
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
109123
- ruby-version: '2.6'
110124
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
125+
- ruby-version: '2.6'
126+
gemfile: gemfiles/rails7.0_graphql2.1.gemfile
111127
- ruby-version: '2.7'
112128
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
113129
- ruby-version: '3.0'

‎Appraisals‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,71 +83,76 @@ appraise 'rails5.2-graphql1.12' do
8383
end
8484

8585
appraise 'rails6.0-graphql1.10' do
86-
gem 'sqlite3', '~> 1.4'
86+
gem 'sqlite3', '~> 1.5.4'
8787
gem 'devise', '>= 4.7'
8888
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
8989
gem 'graphql', '~> 1.10.0'
9090
end
9191

9292
appraise 'rails6.0-graphql1.11' do
93-
gem 'sqlite3', '~> 1.4'
93+
gem 'sqlite3', '~> 1.5.4'
94+
gem 'public_suffix', '< 5'
9495
gem 'devise', '>= 4.7'
9596
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
9697
gem 'graphql', '~> 1.11.0'
9798
end
9899

99100
appraise 'rails6.0-graphql1.12' do
100-
gem 'sqlite3', '~> 1.4'
101+
gem 'sqlite3', '~> 1.5.4'
102+
gem 'public_suffix', '< 5'
101103
gem 'devise', '>= 4.7'
102104
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
103105
gem 'graphql', '~> 1.12.0'
104106
end
105107

106108
appraise 'rails6.0-graphql1.13' do
107-
gem 'sqlite3', '~> 1.4'
109+
gem 'sqlite3', '~> 1.5.4'
108110
gem 'devise', '>= 4.7'
109111
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
110112
gem 'graphql', '~> 1.13.0'
111113
end
112114

113115
appraise 'rails6.1-graphql1.10' do
114-
gem 'sqlite3', '~> 1.4'
116+
gem 'sqlite3', '~> 1.5.4'
115117
gem 'devise', '>= 4.7'
116118
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
117119
gem 'graphql', '~> 1.10.0'
118120
end
119121

120122
appraise 'rails6.1-graphql1.11' do
121-
gem 'sqlite3', '~> 1.4'
123+
gem 'sqlite3', '~> 1.5.4'
124+
gem 'public_suffix', '< 5'
122125
gem 'devise', '>= 4.7'
123126
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
124127
gem 'graphql', '~> 1.11.0'
125128
end
126129

127130
appraise 'rails6.1-graphql1.12' do
128-
gem 'sqlite3', '~> 1.4'
131+
gem 'sqlite3', '~> 1.5.4'
132+
gem 'public_suffix', '< 5'
129133
gem 'devise', '>= 4.7'
130134
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
131135
gem 'graphql', '~> 1.12.0'
132136
end
133137

134138
appraise 'rails6.1-graphql1.13' do
135-
gem 'sqlite3', '~> 1.4'
139+
gem 'sqlite3', '~> 1.5.4'
136140
gem 'devise', '>= 4.7'
137141
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
138142
gem 'graphql', '~> 1.13.0'
139143
end
140144

141145
appraise 'rails6.1-graphql2.0' do
142-
gem 'sqlite3', '~> 1.4'
146+
gem 'public_suffix', '< 5'
147+
gem 'sqlite3', '~> 1.5.4'
143148
gem 'devise', '>= 4.7'
144149
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
145150
gem 'graphql', '~> 2.0.1'
146151
end
147152

148153
appraise 'rails7.0-graphql1.11' do
149154
gem 'sassc-rails'
150-
gem 'sqlite3', '~> 1.4'
155+
gem 'sqlite3', '~> 1.5.4'
151156
gem 'devise', '>= 4.7'
152157
gem 'devise_token_auth', '>= 1.2.1'
153158
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -156,7 +161,7 @@ end
156161

157162
appraise 'rails7.0-graphql1.12' do
158163
gem 'sassc-rails'
159-
gem 'sqlite3', '~> 1.4'
164+
gem 'sqlite3', '~> 1.5.4'
160165
gem 'devise', '>= 4.7'
161166
gem 'devise_token_auth', '>= 1.2.1'
162167
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -165,7 +170,7 @@ end
165170

166171
appraise 'rails7.0-graphql1.13' do
167172
gem 'sassc-rails'
168-
gem 'sqlite3', '~> 1.4'
173+
gem 'sqlite3', '~> 1.5.4'
169174
gem 'devise', '>= 4.7'
170175
gem 'devise_token_auth', '>= 1.2.1'
171176
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
@@ -174,9 +179,18 @@ end
174179

175180
appraise 'rails7.0-graphql2.0' do
176181
gem 'sassc-rails'
177-
gem 'sqlite3', '~> 1.4'
182+
gem 'sqlite3', '~> 1.5.4'
178183
gem 'devise_token_auth', '>= 1.2.1'
179184
gem 'devise', '>= 4.7'
180185
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
181186
gem 'graphql', '~> 2.0.1'
182187
end
188+
189+
appraise 'rails7.0-graphql2.1' do
190+
gem 'sassc-rails'
191+
gem 'sqlite3', '~> 1.5.4'
192+
gem 'devise_token_auth', '>= 1.2.1'
193+
gem 'devise', '>= 4.7'
194+
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
195+
gem 'graphql', '>= 2.1', '< 2.2'
196+
end

‎gemfiles/rails6.0_graphql1.10.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
66
gem "devise", ">= 4.7"
77
gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
88
gem "graphql", "~> 1.10.0"

‎gemfiles/rails6.0_graphql1.11.gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
6+
gem "public_suffix", "< 5"
67
gem "devise", ">= 4.7"
78
gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
89
gem "graphql", "~> 1.11.0"

‎gemfiles/rails6.0_graphql1.12.gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
6+
gem "public_suffix", "< 5"
67
gem "devise", ">= 4.7"
78
gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
89
gem "graphql", "~> 1.12.0"

‎gemfiles/rails6.0_graphql1.13.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
66
gem "devise", ">= 4.7"
77
gem "rails", git: "https://github.com/rails/rails", branch: "6-0-stable"
88
gem "graphql", "~> 1.13.0"

‎gemfiles/rails6.1_graphql1.10.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
66
gem "devise", ">= 4.7"
77
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
88
gem "graphql", "~> 1.10.0"

‎gemfiles/rails6.1_graphql1.11.gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
6+
gem "public_suffix", "< 5"
67
gem "devise", ">= 4.7"
78
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
89
gem "graphql", "~> 1.11.0"

‎gemfiles/rails6.1_graphql1.12.gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
6+
gem "public_suffix", "< 5"
67
gem "devise", ">= 4.7"
78
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
89
gem "graphql", "~> 1.12.0"

‎gemfiles/rails6.1_graphql1.13.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.4"
5+
gem "sqlite3", "~> 1.5.4"
66
gem "devise", ">= 4.7"
77
gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
88
gem "graphql", "~> 1.13.0"

0 commit comments

Comments
 (0)