Merge branch 'faisal/ruby_31_loose' into faisal/main

faisal · May 24, 2024 · 12ce0e7 · 12ce0e7
2 parents 9697e39 + 8f11a20
commit 12ce0e7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
@@ -59,7 +58,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
@@ -89,7 +87,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
@@ -119,7 +116,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -11,7 +11,7 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/**/*'
     - 'gemfiles/*'
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
 
 Metrics/BlockLength:
   Enabled: false
@@ -26,6 +26,9 @@ Layout/LineLength:
 Style/Documentation:
   Enabled: false
 
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either
+
 Security/MarshalLoad:
   Enabled: false
   Include:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # main [(unreleased)](https://github.com/whitesmith/rubycritic/compare/v4.9.1...main)
 
+* [CHANGE] Drop support for Ruby 3.0.x (by [@faisal][])
 * [CHANGE] Drop support for Ruby 2.7.x (by [@faisal][])
 
 # v4.9.1 / 2024-04-14 [(commits)](https://github.com/whitesmith/rubycritic/compare/v4.9.0...v4.9.1)

diff --git a/lib/rubycritic/analysers/coverage.rb b/lib/rubycritic/analysers/coverage.rb
@@ -88,13 +88,13 @@ def stored_data
 
       # Ensure only one process is reading or writing the resultset at any
       # given time
-      def synchronize_resultset(&proc)
+      def synchronize_resultset(&)
         # make it reentrant
         return yield if defined?(@resultset_locked) && @resultset_locked == true
 
         return yield unless File.exist?(resultset_writelock)
 
-        with_lock(&proc)
+        with_lock(&)
       end
 
       def with_lock

diff --git a/lib/rubycritic/core/analysed_modules_collection.rb b/lib/rubycritic/core/analysed_modules_collection.rb
@@ -28,8 +28,8 @@ def initialize(paths, modules = nil)
       end
     end
 
-    def each(&block)
-      @modules.each(&block)
+    def each(&)
+      @modules.each(&)
     end
 
     def where(module_paths)

diff --git a/rubycritic.gemspec b/rubycritic.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'RubyCritic is a Ruby code quality reporter'
   spec.homepage      = 'https://github.com/whitesmith/rubycritic'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.files = [
     'CHANGELOG.md',
@@ -30,35 +30,35 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_path  = 'lib'
 
-  spec.add_runtime_dependency 'flay', '~> 2.13'
-  spec.add_runtime_dependency 'flog', '~> 4.7'
-  spec.add_runtime_dependency 'launchy', '>= 2.5.2'
-  spec.add_runtime_dependency 'parser', '>= 3.3.0.5'
-  spec.add_runtime_dependency 'rainbow', '~> 3.1.1'
-  spec.add_runtime_dependency 'reek', '~> 6.3.0', '< 7.0'
+  spec.add_runtime_dependency 'flay'
+  spec.add_runtime_dependency 'flog'
+  spec.add_runtime_dependency 'launchy'
+  spec.add_runtime_dependency 'parser'
+  spec.add_runtime_dependency 'rainbow'
+  spec.add_runtime_dependency 'reek', '< 7.0'
   spec.add_runtime_dependency 'rexml'
-  spec.add_runtime_dependency 'ruby_parser', '~> 3.21'
-  spec.add_runtime_dependency 'simplecov', '>= 0.22.0'
-  spec.add_runtime_dependency 'tty-which', '~> 0.5.0'
-  spec.add_runtime_dependency 'virtus', '~> 2.0'
+  spec.add_runtime_dependency 'ruby_parser'
+  spec.add_runtime_dependency 'simplecov'
+  spec.add_runtime_dependency 'tty-which'
+  spec.add_runtime_dependency 'virtus'
 
-  spec.add_development_dependency 'aruba', '~> 2.2.0'
-  spec.add_development_dependency 'bundler', '>= 2.0.0'
+  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'bundler'
   if RUBY_PLATFORM == 'java'
     spec.add_development_dependency 'pry-debugger-jruby'
   else
-    spec.add_development_dependency 'byebug', '~> 11.0', '>= 10.0'
+    spec.add_development_dependency 'byebug'
   end
-  spec.add_development_dependency 'cucumber', '~> 9.2.0', '!= 9.0.0'
-  spec.add_development_dependency 'diff-lcs', '~> 1.3'
-  spec.add_development_dependency 'fakefs', '~> 2.5.0'
-  spec.add_development_dependency 'mdl', '~> 0.13.0', '>= 0.12.0'
-  spec.add_development_dependency 'minitest', '~> 5.22.2', '>= 5.3.0'
-  spec.add_development_dependency 'minitest-around', '~> 0.5.0', '>= 0.4.0'
-  spec.add_development_dependency 'mocha', '~> 2.2.0'
-  spec.add_development_dependency 'rake', '~> 13.2.0', '>= 11.0.0'
-  spec.add_development_dependency 'rexml', '>= 3.2.0'
-  spec.add_development_dependency 'rubocop', '~> 1.63.0', '>= 1.54.0'
+  spec.add_development_dependency 'cucumber', '!= 9.0.0'
+  spec.add_development_dependency 'diff-lcs'
+  spec.add_development_dependency 'fakefs'
+  spec.add_development_dependency 'mdl'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-around'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rexml'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-minitest'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rake'