Skip to content

Commit 577d853

Browse files
mcelicalderonmcelicalderon
authored
Merge pull request #241 from graphql-devise/add-rails-7-support-back
Add Rails 7 support again
2 parents 9355e86 + 5e42cf6 commit 577d853

8 files changed

Lines changed: 40 additions & 61 deletions

‎.circleci/config.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -69,35 +69,11 @@ workflows:
6969
- gemfiles/rails6.1_graphql1.12.gemfile
7070
- gemfiles/rails6.1_graphql1.13.gemfile
7171
- gemfiles/rails6.1_graphql2.0.gemfile
72+
- gemfiles/rails7.0_graphql1.11.gemfile
73+
- gemfiles/rails7.0_graphql1.12.gemfile
74+
- gemfiles/rails7.0_graphql1.13.gemfile
75+
- gemfiles/rails7.0_graphql2.0.gemfile
7276
exclude:
73-
- ruby-version: '2.2'
74-
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
75-
- ruby-version: '2.2'
76-
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
77-
- ruby-version: '2.2'
78-
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
79-
- ruby-version: '2.2'
80-
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
81-
- ruby-version: '2.2'
82-
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
83-
- ruby-version: '2.2'
84-
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
85-
- ruby-version: '2.2'
86-
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
87-
- ruby-version: '2.3'
88-
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
89-
- ruby-version: '2.3'
90-
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
91-
- ruby-version: '2.3'
92-
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
93-
- ruby-version: '2.3'
94-
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
95-
- ruby-version: '2.3'
96-
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
97-
- ruby-version: '2.3'
98-
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
99-
- ruby-version: '2.3'
100-
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
10177
- ruby-version: '2.4'
10278
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
10379
- ruby-version: '2.4'
@@ -112,10 +88,34 @@ workflows:
11288
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
11389
- ruby-version: '2.4'
11490
gemfile: gemfiles/rails6.1_graphql2.0.gemfile
91+
- ruby-version: '2.4'
92+
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
93+
- ruby-version: '2.4'
94+
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
95+
- ruby-version: '2.4'
96+
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
97+
- ruby-version: '2.4'
98+
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
99+
- ruby-version: '2.5'
100+
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
115101
- ruby-version: '2.5'
116102
gemfile: gemfiles/rails6.0_graphql1.13.gemfile
117103
- ruby-version: '2.5'
118104
gemfile: gemfiles/rails6.1_graphql1.13.gemfile
105+
- ruby-version: '2.5'
106+
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
107+
- ruby-version: '2.5'
108+
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
109+
- ruby-version: '2.5'
110+
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
111+
- ruby-version: '2.6'
112+
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
113+
- ruby-version: '2.6'
114+
gemfile: gemfiles/rails7.0_graphql1.12.gemfile
115+
- ruby-version: '2.6'
116+
gemfile: gemfiles/rails7.0_graphql1.13.gemfile
117+
- ruby-version: '2.6'
118+
gemfile: gemfiles/rails7.0_graphql2.0.gemfile
119119
- ruby-version: '2.7'
120120
gemfile: gemfiles/rails4.2_graphql1.8.gemfile
121121
- ruby-version: '3.0'

‎Appraisals‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,11 @@ appraise 'rails6.1-graphql2.0' do
145145
gem 'graphql', '~> 2.0.1'
146146
end
147147

148-
appraise 'rails7.0-graphql1.10' do
149-
gem 'sassc-rails'
150-
gem 'sqlite3', '~> 1.4'
151-
gem 'devise', '>= 4.7'
152-
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
153-
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
154-
gem 'graphql', '~> 1.10.0'
155-
end
156-
157148
appraise 'rails7.0-graphql1.11' do
158149
gem 'sassc-rails'
159150
gem 'sqlite3', '~> 1.4'
160151
gem 'devise', '>= 4.7'
161-
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
152+
gem 'devise_token_auth', '>= 1.2.1'
162153
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
163154
gem 'graphql', '~> 1.11.0'
164155
end
@@ -167,7 +158,7 @@ appraise 'rails7.0-graphql1.12' do
167158
gem 'sassc-rails'
168159
gem 'sqlite3', '~> 1.4'
169160
gem 'devise', '>= 4.7'
170-
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
161+
gem 'devise_token_auth', '>= 1.2.1'
171162
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
172163
gem 'graphql', '~> 1.12.0'
173164
end
@@ -176,16 +167,16 @@ appraise 'rails7.0-graphql1.13' do
176167
gem 'sassc-rails'
177168
gem 'sqlite3', '~> 1.4'
178169
gem 'devise', '>= 4.7'
179-
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
170+
gem 'devise_token_auth', '>= 1.2.1'
180171
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
181172
gem 'graphql', '~> 1.13.0'
182173
end
183174

184-
appraise 'rails7.0-graphql_edge' do
175+
appraise 'rails7.0-graphql2.0' do
185176
gem 'sassc-rails'
186177
gem 'sqlite3', '~> 1.4'
187-
gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth', branch: 'master'
178+
gem 'devise_token_auth', '>= 1.2.1'
188179
gem 'devise', '>= 4.7'
189180
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
190-
gem 'graphql', git: 'https://github.com/rmosolgo/graphql-ruby', branch: 'master'
181+
gem 'graphql', '~> 2.0.1'
191182
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "sassc-rails"
66
gem "sqlite3", "~> 1.4"
77
gem "devise", ">= 4.7"
8-
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
8+
gem "devise_token_auth", ">= 1.2.1"
99
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
1010
gem "graphql", "~> 1.11.0"
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "sassc-rails"
66
gem "sqlite3", "~> 1.4"
77
gem "devise", ">= 4.7"
8-
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
8+
gem "devise_token_auth", ">= 1.2.1"
99
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
1010
gem "graphql", "~> 1.12.0"
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "sassc-rails"
66
gem "sqlite3", "~> 1.4"
77
gem "devise", ">= 4.7"
8-
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
8+
gem "devise_token_auth", ">= 1.2.1"
99
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
1010
gem "graphql", "~> 1.13.0"
1111

gemfiles/rails7.0_graphql1.10.gemfile renamed to gemfiles/rails7.0_graphql2.0.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ source "https://rubygems.org"
44

55
gem "sassc-rails"
66
gem "sqlite3", "~> 1.4"
7+
gem "devise_token_auth", ">= 1.2.1"
78
gem "devise", ">= 4.7"
8-
gem "devise_token_auth", git: "https://github.com/lynndylanhurley/devise_token_auth", branch: "master"
99
gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
10-
gem "graphql", "~> 1.10.0"
10+
gem "graphql", "~> 2.0.1"
1111

1212
gemspec path: "../"

‎gemfiles/rails7.0_graphql_edge.gemfile‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎graphql_devise.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
2929

3030
spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
3131
spec.add_dependency 'graphql', '>= 1.8', '< 2.1'
32-
spec.add_dependency 'rails', '>= 4.2', '< 6.2'
32+
spec.add_dependency 'rails', '>= 4.2', '< 7.1'
3333
spec.add_dependency 'zeitwerk'
3434

3535
spec.add_development_dependency 'appraisal'

0 commit comments

Comments
 (0)