From be56200900088f1db2072fad881aeb8be2b994a5 Mon Sep 17 00:00:00 2001
From: Tatheer Fatima <tatheer.fatima@shopify.com>
Date: Tue, 24 Sep 2024 23:04:40 -0400
Subject: [PATCH] fix #2885: Set target ruby version to 3.0 and remove
 references to 2.7

Co-authored-by: Ayana Siddiqui ayanasiddiqui@gmail.com
---
 .github/workflows/ruby.yml                   | 3 +--
 .rubocop.yml                                 | 2 +-
 MAINTAINING.md                               | 2 +-
 faker.gemspec                                | 2 +-
 lib/faker.rb                                 | 4 ++--
 lib/faker/default/id_number.rb               | 2 +-
 test/faker/default/test_faker_crypto_coin.rb | 6 +++---
 test/faker/default/test_faker_vehicle.rb     | 4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 60d97bb8af..cb9c0114d7 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
 
       - name: Install dependencies
         run: bundle install
@@ -38,7 +38,6 @@ jobs:
       fail-fast: false # don't fail all matrix builds if one fails
       matrix:
         ruby:
-          - '2.7'
           - '3.0'
           - '3.1'
           - '3.2'
diff --git a/.rubocop.yml b/.rubocop.yml
index 2973cfe4cb..20059e21bb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 # Suppress noise for obvious operator precedence.
diff --git a/MAINTAINING.md b/MAINTAINING.md
index f0c5504e6c..23672914f9 100644
--- a/MAINTAINING.md
+++ b/MAINTAINING.md
@@ -13,7 +13,7 @@ If you're reviewing a PR, ask yourself:
 ## Managing libraries dependencies EOL
 
 As a guideline for Ruby's End of Life (EOL) versions, a good heuristic (that's not too hard on maintainers) is to keep support for 1 EOL version.
-In other words, once Ruby 3.0 is EOL, drop support for 2.7.
+In other words, once Ruby 3.1 is EOL, drop support for 3.0.
 
 ## Security
 
diff --git a/faker.gemspec b/faker.gemspec
index 8f7b324918..b13fed9e55 100644
--- a/faker.gemspec
+++ b/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 = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
 
   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'
diff --git a/lib/faker.rb b/lib/faker.rb
index 21124798d1..5e5bb5924e 100644
--- a/lib/faker.rb
+++ b/lib/faker.rb
@@ -5,7 +5,7 @@
 require 'psych'
 require 'i18n'
 
-Dir.glob(File.join(mydir, 'helpers', '*.rb')).sort.each { |file| require file }
+Dir.glob(File.join(mydir, 'helpers', '*.rb')).each { |file| require file }
 
 I18n.load_path += Dir[File.join(mydir, 'locales', '**/*.yml')]
 
@@ -275,4 +275,4 @@ def disable_enforce_available_locales
 end
 
 # require faker objects
-Dir.glob(File.join(mydir, 'faker', '/**/*.rb')).sort.each { |file| require file }
+Dir.glob(File.join(mydir, 'faker', '/**/*.rb')).each { |file| require file }
diff --git a/lib/faker/default/id_number.rb b/lib/faker/default/id_number.rb
index b02c17b77e..c695a9065a 100644
--- a/lib/faker/default/id_number.rb
+++ b/lib/faker/default/id_number.rb
@@ -12,7 +12,7 @@ class IdNumber < Base
     ].freeze
     ZA_RACE_DIGIT = '8'
     ZA_CITIZENSHIP_DIGITS = %w[0 1].freeze
-    BRAZILIAN_ID_FORMAT = /(\d{1,2})(\d{3})(\d{3})([\dX])/.freeze
+    BRAZILIAN_ID_FORMAT = /(\d{1,2})(\d{3})(\d{3})([\dX])/
     BRAZILIAN_ID_FROM = 10_000_000
     BRAZILIAN_ID_TO = 99_999_999
 
diff --git a/test/faker/default/test_faker_crypto_coin.rb b/test/faker/default/test_faker_crypto_coin.rb
index feafa6e958..aecb23621a 100644
--- a/test/faker/default/test_faker_crypto_coin.rb
+++ b/test/faker/default/test_faker_crypto_coin.rb
@@ -7,9 +7,9 @@ class TestFakerCryptoCoin < Test::Unit::TestCase
   ACRONYM = 1
   URL_LOGO = 2
 
-  REGEX_COIN_NAME = /[a-zA-Z .]{3,}/.freeze
-  REGEX_ACRONYM = /\w+{3,}/.freeze
-  REGEX_URL_LOGO = /^https:\/\/i.imgur.com\/.......\./.freeze
+  REGEX_COIN_NAME = /[a-zA-Z .]{3,}/
+  REGEX_ACRONYM = /\w+{3,}/
+  REGEX_URL_LOGO = /^https:\/\/i.imgur.com\/.......\./
 
   def setup
     @tester = Faker::CryptoCoin
diff --git a/test/faker/default/test_faker_vehicle.rb b/test/faker/default/test_faker_vehicle.rb
index 71a43943f4..8926651d1c 100644
--- a/test/faker/default/test_faker_vehicle.rb
+++ b/test/faker/default/test_faker_vehicle.rb
@@ -3,8 +3,8 @@
 require_relative '../../test_helper'
 
 class TestFakerVehicle < Test::Unit::TestCase
-  WORD_MATCH = /\w+\.?/.freeze
-  VIN_REGEX = /\A[A-HJ-NPR-Z0-9]{17}\z/.freeze
+  WORD_MATCH = /\w+\.?/
+  VIN_REGEX = /\A[A-HJ-NPR-Z0-9]{17}\z/
 
   def setup
     @tester = Faker::Vehicle