From c118a7af515bee6e5cf98c6555676c2658af35f5 Mon Sep 17 00:00:00 2001 From: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com> Date: Fri, 7 Jan 2022 11:38:41 +0000 Subject: [PATCH] Bump ruby and rails minor versions (#197) --- .ruby-version | 2 +- Dockerfile | 4 +- Gemfile | 4 +- Gemfile.lock | 145 +++++++++++++++++++++++++++++--------------------- 4 files changed, 90 insertions(+), 65 deletions(-) diff --git a/.ruby-version b/.ruby-version index 75a22a26a..fd2a01863 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.3 +3.1.0 diff --git a/Dockerfile b/Dockerfile index b9bfae502..28f0051cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build compilation image -FROM ruby:3.0.3-alpine3.14 as builder +FROM ruby:3.1.0-alpine3.14 as builder # The application runs from /app WORKDIR /app @@ -45,7 +45,7 @@ RUN rm -rf node_modules log tmp && \ find /usr/local/bundle/gems -name "*.html" -delete # Build runtime image -FROM ruby:3.0.3-alpine as production +FROM ruby:3.1.0-alpine as production # The application runs from /app WORKDIR /app diff --git a/Gemfile b/Gemfile index e8d3428ee..85c916dab 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,10 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.0.3" +ruby "3.1.0" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.0.1" # Use postgresql as the database for Active Record gem "pg", "~> 1.1" # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index edfb7530e..186f6daaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,61 +46,67 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.0) - actionpack (= 7.0.0) - activesupport (= 7.0.0) + actioncable (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.0) - actionpack (= 7.0.0) - activejob (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + actionmailbox (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) mail (>= 2.7.1) - actionmailer (7.0.0) - actionpack (= 7.0.0) - actionview (= 7.0.0) - activejob (= 7.0.0) - activesupport (= 7.0.0) + net-imap + net-pop + net-smtp + actionmailer (7.0.1) + actionpack (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activesupport (= 7.0.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.0) - actionview (= 7.0.0) - activesupport (= 7.0.0) + actionpack (7.0.1) + actionview (= 7.0.1) + activesupport (= 7.0.1) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.0) - actionpack (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + actiontext (7.0.1) + actionpack (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.0) - activesupport (= 7.0.0) + actionview (7.0.1) + activesupport (= 7.0.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.0) - activesupport (= 7.0.0) + activejob (7.0.1) + activesupport (= 7.0.1) globalid (>= 0.3.6) - activemodel (7.0.0) - activesupport (= 7.0.0) - activerecord (7.0.0) - activemodel (= 7.0.0) - activesupport (= 7.0.0) - activestorage (7.0.0) - actionpack (= 7.0.0) - activejob (= 7.0.0) - activerecord (= 7.0.0) - activesupport (= 7.0.0) + activemodel (7.0.1) + activesupport (= 7.0.1) + activerecord (7.0.1) + activemodel (= 7.0.1) + activesupport (= 7.0.1) + activestorage (7.0.1) + actionpack (= 7.0.1) + activejob (= 7.0.1) + activerecord (= 7.0.1) + activesupport (= 7.0.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.0) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -137,6 +143,7 @@ GEM crass (1.0.6) deep_merge (1.2.1) diff-lcs (1.5.0) + digest (3.1.0) discard (1.2.1) activerecord (>= 4.2, < 8) docile (1.4.0) @@ -177,6 +184,7 @@ GEM i18n (1.8.11) concurrent-ruby (~> 1.0) iniparse (1.5.0) + io-wait (0.2.1) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -209,12 +217,27 @@ GEM mini_mime (1.1.2) minitest (5.15.0) msgpack (1.4.2) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) - nokogiri (1.12.5-arm64-darwin) + nokogiri (1.13.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) + nokogiri (1.13.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) + nokogiri (1.13.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) overcommit (0.58.0) @@ -240,32 +263,32 @@ GEM rack (2.2.3) rack-mini-profiler (2.3.3) rack (>= 1.2.0) - rack-proxy (0.7.0) + rack-proxy (0.7.2) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (7.0.0) - actioncable (= 7.0.0) - actionmailbox (= 7.0.0) - actionmailer (= 7.0.0) - actionpack (= 7.0.0) - actiontext (= 7.0.0) - actionview (= 7.0.0) - activejob (= 7.0.0) - activemodel (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + rails (7.0.1) + actioncable (= 7.0.1) + actionmailbox (= 7.0.1) + actionmailer (= 7.0.1) + actionpack (= 7.0.1) + actiontext (= 7.0.1) + actionview (= 7.0.1) + activejob (= 7.0.1) + activemodel (= 7.0.1) + activerecord (= 7.0.1) + activestorage (= 7.0.1) + activesupport (= 7.0.1) bundler (>= 1.15.0) - railties (= 7.0.0) + railties (= 7.0.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (7.0.0) - actionpack (= 7.0.0) - activesupport (= 7.0.0) + railties (7.0.1) + actionpack (= 7.0.1) + activesupport (= 7.0.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -357,7 +380,9 @@ GEM simplecov_json_formatter (0.1.3) stimulus-rails (1.0.2) railties (>= 6.0.0) + strscan (3.0.1) thor (1.2.1) + timeout (0.2.0) turbo-rails (1.0.0) actionpack (>= 6.0.0) railties (>= 6.0.0) @@ -422,7 +447,7 @@ DEPENDENCIES pry-byebug puma (~> 5.0) rack-mini-profiler (~> 2.0) - rails (~> 7.0.0) + rails (~> 7.0.1) roo rspec-rails rubocop-govuk @@ -439,7 +464,7 @@ DEPENDENCIES webpacker (~> 5.0) RUBY VERSION - ruby 3.0.3p157 + ruby 3.1.0p0 BUNDLED WITH - 2.2.32 + 2.3.3