diff --git a/.ruby-version b/.ruby-version index fa7adc7a..47b322c9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.4.1 diff --git a/Dockerfile b/Dockerfile index f9e54ca5..9f0d0847 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.4.1 ARG NODE_VERSION=22.7.0 # Use Node image so we can pull the binaries from here. @@ -37,7 +37,7 @@ RUN mkdir -p $APP_HOME WORKDIR $APP_HOME # Copy dependencies files and install libraries. -COPY --link Gemfile Gemfile.lock package.json yarn.lock .yarnrc.yml ./ +COPY --link Gemfile Gemfile.lock package.json yarn.lock .yarnrc.yml .ruby-version ./ RUN corepack enable RUN gem install bundler && bundle install -j 4 && yarn install --immutable && \ diff --git a/Dockerfile.dev b/Dockerfile.dev index a83a3055..11c49975 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.4.1 ARG NODE_VERSION=22.7.0 # Use Node image so we can pull the binaries from here. diff --git a/Gemfile b/Gemfile index e0878827..65c61c18 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '~> 3.3.5' +ruby file: '.ruby-version' gem 'rails', '~> 7.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index f7039d9a..272a8145 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,8 +243,6 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-linux-gnu) flipper (1.3.2) concurrent-ruby (< 2) flipper-active_record (1.3.2) @@ -265,12 +263,6 @@ GEM google-protobuf (4.29.2) bigdecimal rake (>= 13) - google-protobuf (4.29.2-arm64-darwin) - bigdecimal - rake (>= 13) - google-protobuf (4.29.2-x86_64-linux) - bigdecimal - rake (>= 13) has_scope (0.8.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -369,10 +361,6 @@ GEM nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.17.2-arm64-darwin) - racc (~> 1.4) - nokogiri (1.17.2-x86_64-linux) - racc (~> 1.4) octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -680,7 +668,7 @@ DEPENDENCIES yaaf (~> 3.0) RUBY VERSION - ruby 3.3.5p100 + ruby 3.4.1p0 BUNDLED WITH 2.5.18