Merge branch 'main' into ta/reformat-locales

Author: stefannibrasil

.github/dependabot.yml

@@ -1,8 +1,13 @@
 version: 2
 updates:
-- package-ecosystem: bundler
+- package-ecosystem: "bundler"
   directory: "/"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: weekly
 

.github/workflows/codeql.yml

@@ -20,11 +20,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -37,7 +37,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -50,6 +50,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/ruby.yml

@@ -21,7 +21,7 @@ jobs:
     name: RuboCop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.4'
@@ -38,28 +38,22 @@ jobs:
       fail-fast: false # don't fail all matrix builds if one fails
       matrix:
         ruby:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'
+          - '4.0'
           - 'head'
           - truffleruby-head
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
 
     - name: Install dependencies
-      run:  |
-        if [[ "${{ matrix.ruby }}" < "3.1" ]]; then
-          gem install bundler:2.4.22
-          bundle _2.4.22_ install
-        else
-          bundle install
-        fi
+      run: bundle install
 
     - name: Run tests
       run: bundle exec rake test

.rubocop.yml

@@ -3,7 +3,7 @@ plugins:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: enable
 
 # Suppress noise for obvious operator precedence.

Gemfile

@@ -8,13 +8,13 @@ gemspec
 gem 'benchmark'
 gem 'irb'
 gem 'minitest', '5.26.1'
-gem 'pry', '0.15.2'
+gem 'pry', '0.16.0'
 gem 'rake', '13.3.1'
 gem 'rdoc'
-gem 'rubocop', '1.81.7'
+gem 'rubocop', '1.82.1'
 gem 'rubocop-minitest', '0.38.2'
 gem 'rubocop-rake', '0.7.1'
 gem 'simplecov', '0.22.0'
-gem 'test-unit', '3.7.1'
+gem 'test-unit', '3.7.7'
 gem 'timecop', '0.9.10'
-gem 'yard', '0.9.37'
+gem 'yard', '0.9.38'

Gemfile.lock

@@ -10,18 +10,18 @@ GEM
     ast (2.4.3)
     benchmark (0.5.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     date (3.5.1)
     docile (1.4.1)
     erb (6.0.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
     irb (1.16.0)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.16.0)
+    json (2.18.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     method_source (1.1.0)
@@ -34,10 +34,11 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
-    pry (0.15.2)
+    prism (1.7.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
     psych (5.3.1)
       date
       stringio
@@ -51,20 +52,20 @@ GEM
     regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
-    rubocop (1.81.7)
+    rubocop (1.82.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-minitest (0.38.2)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
@@ -80,14 +81,14 @@ GEM
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     stringio (3.2.0)
-    test-unit (3.7.1)
+    test-unit (3.7.7)
       power_assert
     timecop (0.9.10)
     tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
-    yard (0.9.37)
+    unicode-emoji (4.2.0)
+    yard (0.9.38)
 
 PLATFORMS
   arm64-darwin-22
@@ -98,16 +99,16 @@ DEPENDENCIES
   faker!
   irb
   minitest (= 5.26.1)
-  pry (= 0.15.2)
+  pry (= 0.16.0)
   rake (= 13.3.1)
   rdoc
-  rubocop (= 1.81.7)
+  rubocop (= 1.82.1)
   rubocop-minitest (= 0.38.2)
   rubocop-rake (= 0.7.1)
   simplecov (= 0.22.0)
-  test-unit (= 3.7.1)
+  test-unit (= 3.7.7)
   timecop (= 0.9.10)
-  yard (= 0.9.37)
+  yard (= 0.9.38)
 
 BUNDLED WITH
   4.0.3

faker.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = ['faker']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.metadata['changelog_uri'] = 'https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md'
   spec.metadata['source_code_uri'] = 'https://github.com/faker-ruby/faker'

lib/faker.rb

@@ -65,8 +65,8 @@ def bothify(string)
         letterify(numerify(string))
       end
 
-      def generate(as_type, &block)
-        PositionalGenerator.new(as_type, &block).generate
+      def generate(as_type, &)
+        PositionalGenerator.new(as_type, &).generate
       end
 
       # Given a regular expression, attempt to generate a string
@@ -195,7 +195,7 @@ def flexible(key)
       #   name:
       #     girls_name: ["Alice", "Cheryl", "Tatiana"]
       # Then you can call Faker::Name.girls_name and it will act like #first_name
-      def method_missing(mth, *args, &block)
+      def method_missing(mth, *args, &)
         super unless flexible_key
 
         if (translation = translate("faker.#{flexible_key}.#{mth}"))