From 0b4d988b02d5bae1ee427bf3f76de0b9b7e8229f Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Sun, 28 Apr 2024 16:28:55 +0200 Subject: [PATCH] Update Ruby to 3.3.1 --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 2 +- Gemfile | 6 +++--- Gemfile.lock | 44 +++++++++++++++++++++---------------------- docker/app/Dockerfile | 2 +- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/.ruby-version b/.ruby-version index 6a81b4c8..bea438e9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.3.1 diff --git a/.tool-versions b/.tool-versions index 0c465313..5e6f2850 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 2.7.8 +ruby 3.3.1 postgres 16.2 diff --git a/Dockerfile b/Dockerfile index 8c29d9ac..8414b9f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.8-alpine +FROM ruby:3.3.1-alpine RUN apk update && apk upgrade && \ apk add --no-cache bash git openssh \ diff --git a/Gemfile b/Gemfile index a0c22c71..ab1b5e4a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "2.7.8" +ruby "3.3.1" gem "active_link_to" gem "autoprefixer-rails" @@ -27,11 +27,11 @@ gem "omniauth-google-oauth2" gem "omniauth-rails_csrf_protection" gem "omniauth-vkontakte" gem "pg" -gem "phony_rails" +gem "phony_rails", "~> 0.15.0" gem "puma" gem "rack-canonical-host" gem "rails", "~> 6.1" -gem "rails-i18n" +gem "rails-i18n", "~> 6.0" gem "recipient_interceptor" gem "redcarpet", "~> 3.5.1" gem "redis" diff --git a/Gemfile.lock b/Gemfile.lock index 25975e21..d3e4b249 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,8 @@ GEM active_link_to (1.0.5) actionpack addressable - active_record_query_trace (1.6.2) + active_record_query_trace (1.8.2) + activerecord (>= 6.0.0) activejob (6.1.7.7) activesupport (= 6.1.7.7) globalid (>= 0.3.6) @@ -176,8 +177,8 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faker (2.7.0) - i18n (>= 1.6, < 1.8) + faker (3.3.1) + i18n (>= 1.8.11, < 2) faraday (0.17.6) multipart-post (>= 1.2, < 3) ffi (1.16.3) @@ -195,7 +196,7 @@ GEM gravtastic (3.2.6) hashdiff (1.0.0) hashie (5.0.0) - i18n (1.7.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) icalendar (2.6.1) ice_cube (~> 0.16) @@ -217,7 +218,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.4.3) addressable (~> 2.3) - listen (3.2.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.22.0) @@ -261,7 +262,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.1) - nokogiri (1.15.6) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) normalize-rails (4.1.1) @@ -298,10 +299,10 @@ GEM ast (~> 2.4.1) racc pg (1.5.6) - phony (2.18.5) - phony_rails (0.14.13) + phony (2.20.12) + phony_rails (0.15.0) activesupport (>= 3.0) - phony (> 2.15) + phony (>= 2.18.12) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -341,10 +342,10 @@ GEM bundler (>= 1.15.0) railties (= 6.1.7.7) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -352,9 +353,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.9) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 8) + railties (>= 6.0.0, < 7) rails_stdout_logging (0.0.5) railties (6.1.7.7) actionpack (= 6.1.7.7) @@ -364,8 +365,8 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.2.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) recipient_interceptor (0.2.0) mail @@ -470,8 +471,6 @@ GEM sprockets (>= 3.0.0) ssrf_filter (1.1.2) stackprof (0.2.13) - strong_migrations (1.8.0) - activerecord (>= 5.2) temple (0.10.3) thor (1.3.1) tilt (2.3.0) @@ -546,7 +545,7 @@ DEPENDENCIES omniauth-rails_csrf_protection omniauth-vkontakte pg - phony_rails + phony_rails (~> 0.15.0) pry-byebug pry-rails puma @@ -558,7 +557,7 @@ DEPENDENCIES rails-assets-listjs (~> 1.5)! rails-assets-smartcrop (~> 1.1)! rails-controller-testing - rails-i18n + rails-i18n (~> 6.0) rails_stdout_logging recipient_interceptor redcarpet (~> 3.5.1) @@ -574,7 +573,6 @@ DEPENDENCIES slim-rails sprockets (>= 3.0.0) stackprof - strong_migrations timecop toastr-rails uglifier @@ -583,7 +581,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.7.8p225 + ruby 3.3.1p55 BUNDLED WITH 2.4.22 diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 0dcd38d2..0174a716 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.8 +FROM ruby:3.3.1 ENV APP_PATH=/app \ BUNDLE_PATH=/gems