From a7b330846c36767a317f902db2b7b420cf78acc0 Mon Sep 17 00:00:00 2001 From: Just Me Date: Sat, 31 Aug 2024 22:02:12 +0300 Subject: [PATCH] bump ruby from 3.2.2 to 3.3.4 --- .github/workflows/assets-precompile.yml | 4 ++-- .github/workflows/brakeman-analysis.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- .github/workflows/ui-tests.yml | 4 ++-- .rubocop.yml | 2 +- .ruby-version | 2 +- Gemfile | 7 +------ Gemfile.lock | 7 ++----- 8 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/assets-precompile.yml b/.github/workflows/assets-precompile.yml index d277fbc2..94131423 100644 --- a/.github/workflows/assets-precompile.yml +++ b/.github/workflows/assets-precompile.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Ruby 3.2.2 + - name: Set up Ruby 3.3.4 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.4 bundler-cache: true - name: Check ability to precompile current assets diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index b03f900c..3965cde5 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Ruby 3.2.2 + - name: Set up Ruby 3.3.4 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.4 bundler-cache: true - name: Scan diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 929fb295..24d4a3c3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,10 +13,10 @@ jobs: BUNDLE_WITHOUT: development steps: - uses: actions/checkout@v4 - - name: Set up Ruby 3.2.2 + - name: Set up Ruby 3.3.4 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.4 bundler-cache: true - name: Run static code analysis using rubocop diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 3c240b8a..953e96ab 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -43,10 +43,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Ruby 3.2.2 + - name: Set up Ruby 3.3.4 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.4 bundler-cache: true - name: Setup Database diff --git a/.rubocop.yml b/.rubocop.yml index 80c66d50..f2f4b6ea 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -104,7 +104,7 @@ Rails/FilePath: RSpec/ImplicitExpect: EnforcedStyle: should AllCops: - TargetRubyVersion: 3.2.2 + TargetRubyVersion: 3.3.4 NewCops: enable Exclude: - 'node_modules/**/*' diff --git a/.ruby-version b/.ruby-version index be94e6f5..a0891f56 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.4 diff --git a/Gemfile b/Gemfile index 94bbace5..d58d3583 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.2.2' +ruby file: '.ruby-version' gem 'bcrypt', '~> 3.1.20' gem 'bootsnap', '>= 1.4.4', require: false @@ -24,11 +24,6 @@ gem 'rubyzip', require: 'zip' gem 'sassc-rails' gem 'terser' -# Temporarily fix for ruby 3.1 -gem 'net-imap', require: false -gem 'net-pop', require: false -gem 'net-smtp', require: false - group :development, :test do gem 'brakeman' gem 'capybara' diff --git a/Gemfile.lock b/Gemfile.lock index 364a8794..8be90ac6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -440,9 +440,6 @@ DEPENDENCIES jquery-rails letter_opener listen (~> 3.9) - net-imap - net-pop - net-smtp pg (~> 1.5) puma (~> 6.4) pundit @@ -467,7 +464,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.4p94 BUNDLED WITH - 2.4.20 + 2.5.18