AO3-6647 Upgrade Ruby to 3.1.4

.ruby-version

@@ -1 +1 @@
-ruby-3.0.5
+ruby-3.1.4

Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
-ruby "3.0.5"
+ruby "3.1.4"
 
 gem 'test-unit', '~> 3.2'
 
 gem 'bundler'
 
 gem "rails", "~> 6.1.7"
+
 gem "rails-i18n"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
@@ -116,6 +117,9 @@ gem "mimemagic", "0.3.10"
 # Library for helping run pt-online-schema-change commands:
 gem "departure", "~> 6.5"
 
+# Ruby 3.1 means we need to specify a version of mail until we get to rails 7.x
+gem "mail", ">= 2.8"
+
 group :test do
   gem "rspec-rails", "~> 4.0.1"
   gem 'pickle'

Gemfile.lock

@@ -204,6 +204,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.4)
     departure (6.5.0)
       activerecord (>= 5.2.0, < 7.1, != 7.0.0)
       mysql2 (>= 0.4.0, <= 0.5.5)
@@ -326,8 +327,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
     mechanize (2.8.5)
@@ -348,8 +352,7 @@ GEM
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.5)
+    mini_mime (1.1.5)
     minitest (5.17.0)
     mono_logger (1.1.2)
     multi_json (1.15.0)
@@ -363,23 +366,32 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
+    net-imap (0.4.10)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
+    net-smtp (0.4.0)
+      net-protocol
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     netrc (0.11.0)
     newrelic_rpm (9.7.1)
     nio4r (2.5.8)
-    nokogiri (1.16.2)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.23.0)
-    parser (3.1.0.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
     permit_yo (2.1.3)
     phraseapp-in-context-editor-ruby (1.4.0)
       i18n (>= 0.6)
@@ -565,6 +577,7 @@ GEM
     tilt (2.3.0)
     timecop (0.9.4)
     timeliness (0.4.4)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
@@ -603,7 +616,7 @@ GEM
     zeitwerk (2.6.8)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   actionpack-page_caching
@@ -653,6 +666,7 @@ DEPENDENCIES
   launchy
   listen (~> 3.3)
   lograge
+  mail (>= 2.8)
   mechanize
   mimemagic (= 0.3.10)
   minitest
@@ -704,7 +718,7 @@ DEPENDENCIES
   will_paginate (>= 3.0.2)
 
 RUBY VERSION
-   ruby 3.0.5p211
+   ruby 3.1.4p223
 
 BUNDLED WITH
-   2.2.33
+   2.4.22

config/application.rb

@@ -119,6 +119,7 @@ class Application < Rails::Application
       domain: ArchiveConfig.SMTP_DOMAIN,
       port: ArchiveConfig.SMTP_PORT,
       enable_starttls_auto: ArchiveConfig.SMTP_ENABLE_STARTTLS_AUTO,
+      enable_starttls: ArchiveConfig.SMTP_ENABLE_STARTTLS,
       openssl_verify_mode: ArchiveConfig.SMTP_OPENSSL_VERIFY_MODE
     }
     if ArchiveConfig.SMTP_AUTHENTICATION

config/config.yml

@@ -50,6 +50,7 @@ SMTP_PORT: 25
 SMTP_DOMAIN: localhost
 SMTP_OPENSSL_VERIFY_MODE: none
 SMTP_ENABLE_STARTTLS_AUTO: false
+SMTP_ENABLE_STARTTLS: false
 # if required for email authentication
 #SMTP_USER:
 #SMTP_PASSWORD:

config/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.5
+FROM ruby:3.1.4
 
 # Install additional packages
 RUN apt-get update             && \
@@ -16,7 +16,7 @@ VOLUME /otwa
 # Install ruby packages
 COPY Gemfile .
 COPY Gemfile.lock .
-RUN gem install bundler -v 2.2.33 && bundle install
+RUN gem install bundler -v 2.4.22 && bundle install
 
 # Default command to run in a new container
 EXPOSE 3000