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 f80cb97..4bb4c84 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 bf29f1c..e69648e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.3" -gem "net-pop", github: "ruby/net-pop" # 3.3.3 hack fix +ruby "3.3.4" # CORE gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index a2f6e04..4a9c9ee 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: @@ -82,8 +75,8 @@ 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) base64 (0.2.0) bcrypt (3.1.20) bigdecimal (3.1.8) @@ -100,7 +93,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) @@ -112,17 +105,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) @@ -137,11 +130,11 @@ GEM ffaker (2.23.0) globalid (1.2.1) activesupport (>= 6.1) - hashdiff (1.1.0) + hashdiff (1.1.1) i18n (1.14.5) concurrent-ruby (~> 1.0) 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) @@ -150,6 +143,7 @@ GEM json_expressions (0.9.0) jwt (2.8.2) base64 + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -160,31 +154,33 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - minitest (5.24.0) + minitest (5.24.1) 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) @@ -240,7 +236,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) @@ -250,7 +246,7 @@ GEM rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.2) + rspec-rails (6.1.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -259,11 +255,12 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - sidekiq (7.2.4) + 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) stringio (3.1.1) strscan (3.1.0) thor (1.3.1) @@ -272,7 +269,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) @@ -286,7 +283,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 @@ -305,7 +302,6 @@ DEPENDENCIES ffaker jbuilder json_expressions - net-pop! pg puma rack-cors @@ -320,7 +316,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.3.3p89 + ruby 3.3.4p94 BUNDLED WITH 2.5.13 diff --git a/README.md b/README.md index 07bded6..93752a8 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ To run the server in development mode, you can create a `Procfile` with contents such as: ``` -backend: cd Backend && rvm 3.3.3@flyweight exec rails server +backend: cd Backend && rvm 3.3.4@flyweight exec rails server frontend: cd Frontend && yarn dev -jobs: cd Backend && rvm 3.3.3@flyweight exec bundle exec sidekiq -C config/sidekiq.yml -cable: cd Backend && rvm 3.3.3@flyweight exec ./bin/cable +jobs: cd Backend && rvm 3.3.4@flyweight exec bundle exec sidekiq -C config/sidekiq.yml +cable: cd Backend && rvm 3.3.4@flyweight exec ./bin/cable ``` Install the `foreman` gem to run the Procfile.