Update to Ruby 3.0.6

custom-twemoji · Feb 12, 2024 · a044404 · a044404
1 parent f1be0d4
commit a044404
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.8
+        ruby-version: 3.0.6
     - name: Install dependencies
       run: bundle install
     - name: Run Rubocop

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.0.6
diff --git a/Gemfile b/Gemfile
@@ -2,15 +2,15 @@
 
 source 'https://rubygems.org'
 
-ruby '~> 2.7.8'
+ruby '~> 3.0.6'
 
 gem 'json'
 gem 'logger'
 gem 'mini_magick'
 gem 'nokogiri'
 gem 'rack'
-gem 'rackup'
 gem 'rack-protection'
+gem 'rackup'
 gem 'require_all'
 gem 'rubocop', require: false
 gem 'sinatra'
@@ -21,5 +21,4 @@ gem 'unicode-emoji'
 
 group :development, :test do
   gem 'pry'
-  gem 'shotgun'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,12 +15,12 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.15.5)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -58,8 +58,6 @@ GEM
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    shotgun (0.9.2)
-      rack (>= 1.0)
     sinatra (4.0.0)
       mustermann (~> 3.0)
       rack (>= 3.0.0, < 4)
@@ -100,15 +98,14 @@ DEPENDENCIES
   rackup
   require_all
   rubocop
-  shotgun
   sinatra
   sinatra-contrib
   tempfile
   thin
   unicode-emoji
 
 RUBY VERSION
-   ruby 2.7.8p225
+   ruby 3.0.6p216
 
 BUNDLED WITH
-   2.2.22
+   2.2.33
diff --git a/app/models/face.rb b/app/models/face.rb
@@ -10,7 +10,7 @@
 class Face
   # Retrieves all faces
   def self.all(twemoji_version)
-    yml_file = YAML.safe_load(File.read('app/models/twemoji/face.yml'))
+    yml_file = YAML.safe_load_file('app/models/twemoji/face.yml')
 
     version_hash = {}
     version_found = false

diff --git a/app/models/twemoji/twemoji.rb b/app/models/twemoji/twemoji.rb
@@ -13,7 +13,7 @@
 class Twemoji
   attr_reader :xml
 
-  VALID_VERSIONS = YAML.safe_load(File.read('app/models/twemoji/face.yml')).keys.freeze
+  VALID_VERSIONS = YAML.safe_load_file('app/models/twemoji/face.yml').keys.freeze
 
   def initialize(version, id, remove_groups)
     @id = id