diff --git a/.ruby-version b/.ruby-version index 619b537..a0891f5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.3.4 diff --git a/Dockerfile b/Dockerfile index 057fd2b..119242d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.3 +ARG RUBY_VERSION=3.3.4 FROM ruby:$RUBY_VERSION-slim as base LABEL fly_launch_runtime="rails" diff --git a/Gemfile b/Gemfile index 335ec52..6b9c9aa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,7 @@ source "https://rubygems.org" -ruby "3.3.3" -gem "net-pop", github: "ruby/net-pop" # 3.3.3 hack fix +ruby "3.3.4" # FRAMEWORK gem "bootsnap" diff --git a/Gemfile.lock b/Gemfile.lock index 5f44de0..3e2c3cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: https://github.com/ruby/net-pop.git - revision: e8d0afe2773b9eb6a23c39e9e437f6fc0fc7c733 - specs: - net-pop (0.1.2) - net-protocol - GEM remote: https://rubygems.org/ specs: @@ -87,23 +80,23 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aws-eventstream (1.3.0) - aws-partitions (1.945.0) - aws-sdk-core (3.197.1) + aws-partitions (1.961.0) + aws-sdk-core (3.201.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.85.0) - aws-sdk-core (~> 3, >= 3.197.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.152.3) - aws-sdk-core (~> 3, >= 3.197.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.157.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) @@ -124,7 +117,7 @@ GEM crass (1.0.6) database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.1.0) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -136,17 +129,17 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-jwt (0.11.0) + devise-jwt (0.12.1) devise (~> 4.0) - warden-jwt_auth (~> 0.8) + warden-jwt_auth (~> 0.10) diff-lcs (1.5.1) - dockerfile-rails (1.6.16) + dockerfile-rails (1.6.17) rails (>= 3.0.0) drb (2.2.1) dry-auto_inject (1.0.1) dry-core (~> 1.0) zeitwerk (~> 2.6) - dry-configurable (1.1.0) + dry-configurable (1.2.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) dry-core (1.0.1) @@ -164,14 +157,14 @@ GEM ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) - hashdiff (1.1.0) + hashdiff (1.1.1) i18n (1.14.5) concurrent-ruby (~> 1.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-console (0.7.2) - irb (1.13.2) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.12.0) @@ -187,6 +180,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -196,34 +190,36 @@ GEM net-pop net-smtp marcel (1.0.4) - mini_magick (4.13.1) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.24.0) + minitest (5.24.1) msgpack (1.7.2) mutex_m (0.2.0) - net-imap (0.4.13) + net-imap (0.4.14) date net-protocol + net-pop (0.1.2) + net-protocol net-protocol (0.2.2) timeout net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6-aarch64-linux) + nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.6-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) - pg (1.5.6) + pg (1.5.7) psych (5.1.2) stringio - public_suffix (5.1.1) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) - rack (3.1.3) + racc (1.8.1) + rack (3.1.7) rack-cors (2.0.2) rack (>= 2.0.0) rack-session (2.0.0) @@ -282,7 +278,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.0) + rexml (3.3.4) strscan rspec-core (3.13.0) rspec-support (~> 3.13.0) @@ -301,13 +297,15 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - ruby-vips (2.2.1) + ruby-vips (2.2.2) ffi (~> 1.12) - sidekiq (7.2.4) + logger + sidekiq (7.3.0) concurrent-ruby (< 2) connection_pool (>= 2.3.0) + logger rack (>= 2.2.4) - redis-client (>= 0.19.0) + redis-client (>= 0.22.2) spring (4.2.1) spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) @@ -320,7 +318,7 @@ GEM concurrent-ruby (~> 1.0) warden (1.2.9) rack (>= 2.0.9) - warden-jwt_auth (0.8.0) + warden-jwt_auth (0.10.0) dry-auto_inject (>= 0.8, < 2) dry-configurable (>= 0.13, < 2) jwt (~> 2.1) @@ -334,7 +332,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) yard (0.9.36) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS aarch64-linux @@ -360,7 +358,6 @@ DEPENDENCIES json_expressions json_matchers listen - net-pop! pg puma rack-cors @@ -377,7 +374,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.3.3p89 + ruby 3.3.4p94 BUNDLED WITH - 2.5.13 + 2.5.17 diff --git a/README.md b/README.md index 0335eab..426b8b7 100644 --- a/README.md +++ b/README.md @@ -50,10 +50,10 @@ not part of the Gemfile and should be `gem install`ed manually.) An example Foreman script that accomplishes all of this: ``` -backend: cd Backend && rvm 3.3.3@greenie exec rails server +backend: cd Backend && rvm 3.3.4@greenie exec rails server frontend: cd Frontend && yarn serve -workers: cd Backend && rvm 3.3.3@greenie exec bundle exec sidekiq -C config/sidekiq.yml -cable: cd Backend && rvm 3.3.3@greenie exec ./bin/cable +workers: cd Backend && rvm 3.3.4@greenie exec bundle exec sidekiq -C config/sidekiq.yml +cable: cd Backend && rvm 3.3.4@greenie exec ./bin/cable mail: mailcatcher -f ```