Skip to content

Commit e1d3cb4

Browse files
Merge pull request #197 from graphql-devise/drop-support-for-ruby-2.2
Drop support for ruby 2.2
2 parents e9c9a8f + 545bcf9 commit e1d3cb4

3 files changed

Lines changed: 14 additions & 23 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ workflows:
4747
matrix:
4848
parameters:
4949
ruby-version:
50-
- '2.2'
5150
- '2.3'
5251
- '2.4'
5352
- '2.5'
@@ -69,14 +68,6 @@ workflows:
6968
- gemfiles/rails6.1_graphql1.11.gemfile
7069
- gemfiles/rails6.1_graphql1.12.gemfile
7170
exclude:
72-
- ruby-version: '2.2'
73-
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
74-
- ruby-version: '2.2'
75-
gemfile: gemfiles/rails6.0_graphql1.12.gemfile
76-
- ruby-version: '2.2'
77-
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
78-
- ruby-version: '2.2'
79-
gemfile: gemfiles/rails6.1_graphql1.12.gemfile
8071
- ruby-version: '2.3'
8172
gemfile: gemfiles/rails6.0_graphql1.11.gemfile
8273
- ruby-version: '2.3'

.rubocop.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
require: rubocop-rspec
2-
require: rubocop-performance
3-
4-
Rails:
5-
Enabled: true
1+
require:
2+
- rubocop-rspec
3+
- rubocop-performance
4+
- rubocop-rails
65

76
AllCops:
8-
TargetRubyVersion: 2.2
7+
TargetRubyVersion: 2.3
98
DisplayCopNames: true
109
Exclude:
1110
- bin/**/*
@@ -82,7 +81,7 @@ Style/FrozenStringLiteralComment:
8281
Style/StringMethods:
8382
Enabled: true
8483

85-
Metrics/LineLength:
84+
Layout/LineLength:
8685
Max: 120
8786

8887
Metrics/MethodLength:
@@ -91,16 +90,16 @@ Metrics/MethodLength:
9190
Metrics/BlockLength:
9291
Enabled: false
9392

94-
Layout/AlignHash:
93+
Layout/HashAlignment:
9594
EnforcedColonStyle: table
9695

97-
Layout/AlignParameters:
96+
Layout/ParameterAlignment:
9897
EnforcedStyle: with_fixed_indentation
9998
SupportedStyles:
10099
- with_first_parameter
101100
- with_fixed_indentation
102101

103-
Lint/EndAlignment:
102+
Layout/EndAlignment:
104103
EnforcedStyleAlignWith: variable
105104
SupportedStylesAlignWith:
106105
- keyword

graphql_devise.gemspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
2525
`git ls-files -z`.split("\x0").select { |f| f.match(%r{^spec/}) }
2626
end
2727

28-
spec.required_ruby_version = '>= 2.2.0'
28+
spec.required_ruby_version = '>= 2.3.0'
2929

3030
spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
3131
spec.add_dependency 'graphql', '>= 1.8', '< 1.13.0'
@@ -41,8 +41,9 @@ Gem::Specification.new do |spec|
4141
spec.add_development_dependency 'pry-byebug'
4242
spec.add_development_dependency 'rake', '>= 12.3.3'
4343
spec.add_development_dependency 'rspec-rails', '~> 4.0'
44-
spec.add_development_dependency 'rubocop', '0.68.1'
45-
spec.add_development_dependency 'rubocop-performance'
46-
spec.add_development_dependency 'rubocop-rspec'
44+
spec.add_development_dependency 'rubocop', '< 0.82.0'
45+
spec.add_development_dependency 'rubocop-performance', '< 1.6.0'
46+
spec.add_development_dependency 'rubocop-rails', '< 2.6.0'
47+
spec.add_development_dependency 'rubocop-rspec', '< 1.39.0'
4748
spec.add_development_dependency 'sqlite3', '~> 1.3'
4849
end

0 commit comments

Comments
 (0)