From 7e57d503aacacc0eda3a3f46cde33f682b231cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 15 Aug 2024 13:49:57 +0200 Subject: [PATCH 1/4] Use Ruby 3.3.4 --- .github/workflows/tests.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index caa2627..472fa3a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: - name: Install Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.3 + ruby-version: 3.3.4 bundler-cache: true - name: Run specs env: diff --git a/.ruby-version b/.ruby-version index fefb2b7..6d5369b 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.3.3 +ruby-3.3.4 diff --git a/Gemfile b/Gemfile index 9085c2b..e18b130 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.3" +ruby "3.3.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5bb4b22..a4a2768 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -385,7 +385,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.3.3p89 + ruby 3.3.4p94 BUNDLED WITH 2.5.14 From 8a6b88058dc4d23ceab5f688c88df72a106c5f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 15 Aug 2024 13:50:31 +0200 Subject: [PATCH 2/4] Update bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4a2768..6521550 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,4 +388,4 @@ RUBY VERSION ruby 3.3.4p94 BUNDLED WITH - 2.5.14 + 2.5.17 From c9bfc14c3157174c9b43f7c2eb1f7088ab3c3d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 15 Aug 2024 13:51:53 +0200 Subject: [PATCH 3/4] Remove explicit requirement for net-pop --- Gemfile | 2 -- Gemfile.lock | 10 ++-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index e18b130..0300f25 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,6 @@ ruby "3.3.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.2.0" -# Needed until Ruby 3.3.4 is released https://github.com/ruby/ruby/pull/11006 -gem 'net-pop', github: 'ruby/net-pop' # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 6521550..70c58c6 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: @@ -167,6 +160,8 @@ GEM 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) @@ -366,7 +361,6 @@ DEPENDENCIES importmap-rails jbuilder kaminari - net-pop! octokit omniauth-github omniauth-orcid From b4aae87a06351e7b2aaf5cd8c37a51b8248b25ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Thu, 15 Aug 2024 13:53:25 +0200 Subject: [PATCH 4/4] Update dependencies --- Gemfile.lock | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 70c58c6..e9e74c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM base64 (0.2.0) bigdecimal (3.1.8) bindex (0.8.1) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) builder (3.3.0) capybara (3.40.0) @@ -103,9 +103,10 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (2.9.2) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) + logger + faraday-net_http (3.1.1) net-http faraday-retry (2.2.1) faraday (~> 2.0) @@ -151,7 +152,7 @@ GEM marcel (1.0.4) matrix (0.4.2) mini_mime (1.1.5) - minitest (5.24.1) + minitest (5.25.0) msgpack (1.7.2) multi_xml (0.7.1) bigdecimal (~> 3.1) @@ -205,10 +206,10 @@ GEM omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) - pg (1.5.6) + pg (1.5.7) psych (5.1.2) stringio - public_suffix (6.0.0) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) racc (1.8.1) @@ -262,7 +263,7 @@ GEM regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) - rexml (3.3.1) + rexml (3.3.5) strscan rspec-core (3.13.0) rspec-support (~> 3.13.0) @@ -287,7 +288,7 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) securerandom (0.3.1) - selenium-webdriver (4.22.0) + selenium-webdriver (4.23.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -299,7 +300,7 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.5.1) + sprockets-rails (3.5.2) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) @@ -307,21 +308,21 @@ GEM railties (>= 6.0.0) stringio (3.1.1) strscan (3.1.0) - tailwindcss-rails (2.6.1) + tailwindcss-rails (2.7.3) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-aarch64-linux) + tailwindcss-rails (2.7.3-aarch64-linux) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-arm-linux) + tailwindcss-rails (2.7.3-arm-linux) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-arm64-darwin) + tailwindcss-rails (2.7.3-arm64-darwin) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-x86_64-darwin) + tailwindcss-rails (2.7.3-x86_64-darwin) railties (>= 7.0.0) - tailwindcss-rails (2.6.1-x86_64-linux) + tailwindcss-rails (2.7.3-x86_64-linux) railties (>= 7.0.0) thor (1.3.1) timeout (0.4.1) - turbo-rails (2.0.5) + turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -336,7 +337,7 @@ GEM bindex (>= 0.4.0) railties (>= 6.0.0) webrick (1.8.1) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5)