diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 90bfc97b..a79e3649 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1,3 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.4.2 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION diff --git a/.ruby-version b/.ruby-version index fa7adc7a..4d9d11cf 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.4.2 diff --git a/Dockerfile b/Dockerfile index 7f23a6c2..386e978f 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.5 +ARG RUBY_VERSION=3.4.2 FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-jemalloc-slim as base LABEL fly_launch_runtime="rails" diff --git a/Gemfile b/Gemfile index 7678f23b..82a27dc8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.5" +ruby "3.4.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "7.2.0" @@ -77,7 +77,7 @@ gem "phlex-rails", github: "phlex-ruby/phlex-rails" gem "ruby_ui", github: "ruby-ui/ruby_ui", branch: "main", require: false # gem "ruby_ui", path: "../ruby_ui" -gem "pry" +gem "pry", "0.15.2" gem "tailwind_merge", "~> 0.13.2" diff --git a/Gemfile.lock b/Gemfile.lock index ed460fec..8387bd4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,13 +8,13 @@ GIT GIT remote: https://github.com/phlex-ruby/phlex.git - revision: bdff5f6800d36717bd576c8af8331ebeca8b4b3b + revision: 2e858fb3fa95e144a0631ce77ff860a3a404f7ed specs: phlex (2.0.2) GIT remote: https://github.com/ruby-ui/ruby_ui.git - revision: 537b7c06f57a0918e4ba07ce08c3dad3dace15a3 + revision: 8152bef6098d1278932136a059a240ecae0f755e branch: main specs: ruby_ui (1.0.0.beta1) @@ -96,7 +96,7 @@ GEM public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) @@ -111,34 +111,35 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) coderay (1.1.3) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) crass (1.0.6) cssbundling-rails (1.4.0) railties (>= 6.0.0) - date (3.4.0) - debug (1.9.2) + date (3.4.1) + debug (1.10.0) irb (~> 1.10) reline (>= 0.3.8) - dockerfile-rails (1.6.24) + dockerfile-rails (1.7.6) rails (>= 3.0.0) drb (2.2.1) - erubi (1.13.0) + erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) - io-console (0.7.2) - irb (1.14.1) + io-console (0.8.0) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jsbundling-rails (1.3.0) railties (>= 6.0.0) - json (2.8.1) - language_server-protocol (3.17.0.3) + json (2.10.1) + language_server-protocol (3.17.0.4) lint_roller (1.1.0) - logger (1.6.1) - loofah (2.23.1) + logger (1.6.6) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) lru_redux (1.1.0) @@ -153,46 +154,51 @@ GEM matrix (0.4.2) method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) - msgpack (1.7.3) - net-imap (0.5.0) + mini_portile2 (2.8.8) + minitest (5.25.4) + msgpack (1.8.0) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.16.7) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.1) ast (~> 2.4.1) racc + pp (0.6.2) + prettyprint + prettyprint (0.2.0) propshaft (0.9.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack railties (>= 7.0.0) - pry (0.14.2) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - psych (5.2.0) + psych (5.2.3) + date stringio public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.8) - rack-session (2.0.0) + rack (3.1.10) + rack-session (2.1.0) + base64 (>= 0.1.0) rack (>= 3.0.0) - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) - rackup (2.2.0) + rackup (2.2.1) rack (>= 3) rails (7.2.0) actioncable (= 7.2.0) @@ -212,9 +218,9 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.2.0) actionpack (= 7.2.0) activesupport (= 7.2.0) @@ -225,78 +231,81 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdoc (6.7.0) + rdoc (6.12.0) psych (>= 4.0.0) - regexp_parser (2.9.2) - reline (0.5.11) + regexp_parser (2.10.0) + reline (0.6.0) io-console (~> 0.5) - rexml (3.3.9) + rexml (3.4.1) rouge (4.5.1) - rubocop (1.66.1) + rubocop (1.71.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.34.1) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) - rubocop-performance (1.22.1) + rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - rubyzip (2.3.2) - securerandom (0.3.1) - selenium-webdriver (4.26.0) + rubyzip (2.4.1) + securerandom (0.4.1) + selenium-webdriver (4.28.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sqlite3 (2.2.0) + sqlite3 (2.5.0) mini_portile2 (~> 2.8.0) - standard (1.41.1) + standard (1.45.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.66.0) + rubocop (~> 1.71.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.5) + standard-performance (~> 1.6) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.5.0) + standard-performance (1.6.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.22.0) + rubocop-performance (~> 1.23.0) stimulus-rails (1.3.3) railties (>= 6.0.0) - stringio (3.1.2) - tailwind_merge (0.13.2) + stringio (3.1.3) + tailwind_merge (0.13.3) lru_redux (~> 1.1) thor (1.3.2) - timeout (0.4.2) + timeout (0.4.3) turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.6.0) - useragent (0.16.10) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) + useragent (0.16.11) web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) websocket (1.2.11) - websocket-driver (0.7.6) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.1) + zeitwerk (2.7.2) PLATFORMS ruby @@ -312,7 +321,7 @@ DEPENDENCIES phlex! phlex-rails! propshaft (= 0.9.0) - pry + pry (= 0.15.2) puma (= 6.4.2) rails (= 7.2.0) rouge (~> 4.5) @@ -327,7 +336,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.3.5p100 + ruby 3.4.2p28 BUNDLED WITH - 2.5.22 + 2.6.4