Skip to content

Commit

Permalink
Merge pull request #553 from puppetlabs/CAT-1686-Upgrade_rubocop
Browse files Browse the repository at this point in the history
(CAT-1686) Upgrade Rubocop 1.48.1 to 1.50.0
  • Loading branch information
jordanbreen28 authored Jan 16, 2024
2 parents 5380ab3 + 75c03e4 commit f199535
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source 'https://rubygems.org'

gem 'rubocop', '= 1.48.1', require: false
gem 'rubocop', '= 1.50.0', require: false
gem 'rubocop-performance', '= 1.16.0', require: false
gem 'rubocop-rspec', '= 2.19.0', require: false
2 changes: 1 addition & 1 deletion config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ Gemfile:
- gem: 'puppet-debugger'
version: '~> 1.0'
- gem: 'rubocop'
version: '= 1.48.1'
version: '= 1.50.0'
- gem: 'rubocop-performance'
version: '= 1.16.0'
- gem: 'rubocop-rspec'
Expand Down
2 changes: 1 addition & 1 deletion moduleroot/.rubocop.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ profile = @configs['profiles'][@configs['selected_profile']]
configs = defaults.dup
DeepMerge::deep_merge!(profile['configs'], configs, knockout_prefix: "--", preserve_unmergeables: false)

default_version = '1.48.1'
default_version = '1.50.0'

# rubocop's dependencies have native extensions and are not available on windows currently
# to preserve the dynamic behaviour, and still work in its current state, this workaround
Expand Down
3 changes: 3 additions & 0 deletions rubocop/defaults-1.48.1.yml → rubocop/defaults-1.50.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
- Lint/DeprecatedConstants
- Lint/DuplicateBranch
- Lint/DuplicateMagicComment
- Lint/DuplicateMatchPattern
- Lint/DuplicateRegexpCharacterClassElement
- Lint/EmptyBlock
- Lint/EmptyClass
Expand Down Expand Up @@ -589,6 +590,7 @@
- Style/CollectionCompact
- Style/ComparableClamp
- Style/ConcatArrayLiterals
- Style/DataInheritance
- Style/DirEmpty
- Style/DocumentDynamicEvalDefinition
- Style/EmptyHeredoc
Expand Down Expand Up @@ -623,6 +625,7 @@
- Style/RedundantEach
- Style/RedundantHeredocDelimiterQuotes
- Style/RedundantInitialize
- Style/RedundantLineContinuation
- Style/RedundantSelfAssignmentBranch
- Style/RedundantStringEscape
- Style/SelectByRegexp
Expand Down

0 comments on commit f199535

Please sign in to comment.