Merge pull request #155 from chef/1.25

Update to RuboCop 1.25
chef · Jan 18, 2022 · bd166b2 · bd166b2
2 parents de278c0 + d2ab868
commit bd166b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/upstream.yml b/config/upstream.yml
@@ -2496,6 +2496,7 @@ Naming/BlockForwarding:
   SupportedStyles:
     - anonymous
     - explicit
+  BlockForwardingName: block
 
 Naming/BlockParameterName:
   Description: >-
@@ -3698,6 +3699,8 @@ Style/HashSyntax:
     - always
     # forces use of explicit hash literal value.
     - never
+    # accepts both shorthand and explicit use of hash literal value.
+    - either
   # Force hashes that have a symbol value to use hash rockets
   UseHashRocketsWithSymbolValues: false
   # Do not suggest { a?: 1 } over { :a? => 1 } in ruby19 style

diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Chefstyle
   VERSION = "2.2.0"
-  RUBOCOP_VERSION = "1.24.1"
+  RUBOCOP_VERSION = "1.25.0"
 end