Use Ruby 2.7.2 (#15150)

thwait and e2mmap are no longer needed in Gemfile.
Gems properly require those.

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

diff --git a/Dockerfile b/Dockerfile
index c52f89fdca1eef00be91b8f19dd0a17614d1821b..57d061fd0ed0ffafa04b8aa839188f6319c32f92 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ RUN apt update && \
        cd .. && rm -rf jemalloc-$JE_VER $JE_VER.tar.gz
 
 # Install Ruby
-ENV RUBY_VER="2.6.6"
+ENV RUBY_VER="2.7.2"
 ENV CPPFLAGS="-I/opt/jemalloc/include"
 ENV LDFLAGS="-L/opt/jemalloc/lib/"
 RUN apt update && \

diff --git a/Gemfile b/Gemfile
index 330222922abcbf5cac7046478ef675d2b48a9465..30b5435b53fcc0a061d0a1329864bd5607b0bc33 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -11,9 +11,6 @@ gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.0'
 gem 'rack', '~> 2.2.3'
 
-gem 'thwait', '~> 0.2.0'
-gem 'e2mmap', '~> 0.1.0'
-
 gem 'hamlit-rails', '~> 0.2'
 gem 'pg', '~> 1.2'
 gem 'makara', '~> 0.4'

diff --git a/Gemfile.lock b/Gemfile.lock
index dffd7d791e150989e9b78fa1153541a5fc88b174..b333c4e995f2f87846766893d0c2fa8d7cd41d50 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -704,7 +704,6 @@ DEPENDENCIES
   discard (~> 1.2)
   doorkeeper (~> 5.4)
   dotenv-rails (~> 2.7)
-  e2mmap (~> 0.1.0)
   ed25519 (~> 1.2)
   fabrication (~> 2.21)
   faker (~> 2.14)
@@ -793,7 +792,6 @@ DEPENDENCIES
   streamio-ffmpeg (~> 3.0)
   strong_migrations (~> 0.7)
   thor (~> 1.0)
-  thwait (~> 0.2.0)
   tty-prompt (~> 0.22)
   twitter-text (~> 1.14)
   tzinfo-data (~> 1.2020)