Use ruby-2.7.4 (#16481)

Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781

diff --git a/.ruby-version b/.ruby-version
index 37c2961c2430f357166156e7ddf1c590eb8d4ce1..a4dd9dba4fbfc56b9de647bc31ed848d9f65885f 100644 (file)
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.4

diff --git a/Dockerfile b/Dockerfile
index 962e5a8c9b26ed12a8f7054e9b8272d41c54f3f1..8279e873595531f8bfaa7e031013362c37ba3bb3 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN ARCH= && \
        mv node-v$NODE_VER-linux-$ARCH /opt/node
 
 # Install Ruby
-ENV RUBY_VER="2.7.2"
+ENV RUBY_VER="2.7.4"
 RUN apt-get update && \
   apt-get install -y --no-install-recommends build-essential \
     bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \

diff --git a/Gemfile b/Gemfile
index a76e69ac3ba7eabfe618fdf2d12198a197777ffe..e80312047de24e262b89a5245925d4a1eb1c3fee 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -155,5 +155,3 @@ gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 
 gem 'xorcist', '~> 1.1'
-
-gem 'resolv', '~> 0.1.0'

diff --git a/Gemfile.lock b/Gemfile.lock
index 96d89fbae5773c4b47e643661bdb25215b3393e9..6ebdd67a913b3d78a44650c9ab55fc247c2c690f 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,7 +491,6 @@ GEM
     regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
-    resolv (0.1.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -764,7 +763,6 @@ DEPENDENCIES
   rdf-normalize (~> 0.4)
   redis (~> 4.3)
   redis-namespace (~> 1.8)
-  resolv (~> 0.1.0)
   rqrcode (~> 2.0)
   rspec-rails (~> 5.0)
   rspec-sidekiq (~> 3.1)