From 4aff3d222aebc49139cc6098a25e051f7bb4417e Mon Sep 17 00:00:00 2001 From: Rafael Soares <893971+rafasoares@users.noreply.github.com> Date: Fri, 24 May 2024 23:31:35 +0200 Subject: [PATCH] ci(deps): :green_heart: fix activerecord version in multilock --- .github/workflows/tests.yml | 2 +- .ruby-version | 2 +- Gemfile | 17 ++++++++------ Gemfile.lock | 33 ++++++++++++++++++---------- Gemfile.rails-6.1.lock | 32 +++++++++++++++++---------- Gemfile.rails-7.0.lock | 44 +++++++++++++++++++++++-------------- Gemfile.rails-7.1.lock | 32 +++++++++++++++++---------- 7 files changed, 103 insertions(+), 59 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cd3803c..f3760d8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: rails: ['6.1', '7.0', '7.1'] env: - BUNDLE_LOCKILE: ${{ matrix.rails }} + BUNDLE_LOCKILE: rails-${{ matrix.rails }} steps: - uses: actions/checkout@v4 diff --git a/.ruby-version b/.ruby-version index aed7acb..4a85a55 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.2.4 +ruby-3.3.1 diff --git a/Gemfile b/Gemfile index cedda2c..2525b08 100644 --- a/Gemfile +++ b/Gemfile @@ -2,25 +2,28 @@ source 'https://rubygems.org' -plugin "bundler-multilock", "~> 1.3" -return unless Plugin.installed?("bundler-multilock") +gemspec + +plugin 'bundler-multilock', '~> 1.3' +return unless Plugin.installed?('bundler-multilock') -Plugin.send(:load_plugin, "bundler-multilock") +Plugin.send(:load_plugin, 'bundler-multilock') lockfile 'rails-6.1' do gem 'activerecord', '~> 6.1.0' end lockfile 'rails-7.0' do - gem 'activerecord', '~> 7.0.0' + gem 'activerecord', '~> 7.0.0' # rubocop:disable Bundler/DuplicatedGem end lockfile 'rails-7.1' do - gem 'activerecord', '~> 7.1.0' + gem 'activerecord', '~> 7.1.0' # rubocop:disable Bundler/DuplicatedGem end -# Specify your gem's dependencies in human_enum.gemspec -gemspec +lockfile do + gem 'activerecord', '~> 7.1.0' # rubocop:disable Bundler/DuplicatedGem +end gem 'rake', '~> 13.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8b74f4d..da6439e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,19 +70,20 @@ GEM parser (3.3.1.0) ast (~> 2.4.1) racc - prism (0.27.0) + prism (0.29.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) + racc (1.8.0) rack (3.0.11) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -117,7 +118,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -131,9 +132,9 @@ GEM rubocop-rspec_rails (~> 2.28) rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) - ruby-lsp (0.16.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.23.0, < 0.28) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) ruby-lsp-rails (0.3.6) ruby-lsp (>= 0.16.5, < 0.17.0) @@ -148,9 +149,14 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sorbet-runtime (0.5.11371) + sorbet-runtime (0.5.11391) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) + strscan (3.1.0) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) @@ -158,10 +164,15 @@ GEM unicode-display_width (2.5.0) PLATFORMS - x86_64-darwin-22 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES + activerecord (~> 7.1.0) guard (~> 2.18) guard-rspec (~> 4.7) guard-rubocop (~> 1.5) @@ -179,4 +190,4 @@ DEPENDENCIES sqlite3 (~> 1.4) BUNDLED WITH - 2.4.19 + 2.5.10 diff --git a/Gemfile.rails-6.1.lock b/Gemfile.rails-6.1.lock index 8663e46..fa13ca9 100644 --- a/Gemfile.rails-6.1.lock +++ b/Gemfile.rails-6.1.lock @@ -61,19 +61,20 @@ GEM parser (3.3.1.0) ast (~> 2.4.1) racc - prism (0.27.0) + prism (0.29.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) + racc (1.8.0) rack (3.0.11) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -108,7 +109,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -122,9 +123,9 @@ GEM rubocop-rspec_rails (~> 2.28) rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) - ruby-lsp (0.16.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.23.0, < 0.28) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) ruby-lsp-rails (0.3.6) ruby-lsp (>= 0.16.5, < 0.17.0) @@ -139,9 +140,14 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sorbet-runtime (0.5.11371) + sorbet-runtime (0.5.11391) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) + strscan (3.1.0) thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -149,7 +155,11 @@ GEM zeitwerk (2.6.14) PLATFORMS - x86_64-darwin-22 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -171,4 +181,4 @@ DEPENDENCIES sqlite3 (~> 1.4) BUNDLED WITH - 2.4.19 + 2.5.10 diff --git a/Gemfile.rails-7.0.lock b/Gemfile.rails-7.0.lock index 3e6e69b..53f1770 100644 --- a/Gemfile.rails-7.0.lock +++ b/Gemfile.rails-7.0.lock @@ -7,12 +7,12 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (7.0.7.2) - activesupport (= 7.0.7.2) - activerecord (7.0.7.2) - activemodel (= 7.0.7.2) - activesupport (= 7.0.7.2) - activesupport (7.0.7.2) + activemodel (7.0.8.3) + activesupport (= 7.0.8.3) + activerecord (7.0.8.3) + activemodel (= 7.0.8.3) + activesupport (= 7.0.8.3) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -60,19 +60,20 @@ GEM parser (3.3.1.0) ast (~> 2.4.1) racc - prism (0.27.0) + prism (0.29.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) + racc (1.8.0) rack (3.0.11) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -107,7 +108,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -121,9 +122,9 @@ GEM rubocop-rspec_rails (~> 2.28) rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) - ruby-lsp (0.16.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.23.0, < 0.28) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) ruby-lsp-rails (0.3.6) ruby-lsp (>= 0.16.5, < 0.17.0) @@ -138,16 +139,25 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sorbet-runtime (0.5.11371) + sorbet-runtime (0.5.11391) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) + strscan (3.1.0) thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) PLATFORMS - x86_64-darwin-22 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -169,4 +179,4 @@ DEPENDENCIES sqlite3 (~> 1.4) BUNDLED WITH - 2.4.19 + 2.5.10 diff --git a/Gemfile.rails-7.1.lock b/Gemfile.rails-7.1.lock index 7d2d693..da6439e 100644 --- a/Gemfile.rails-7.1.lock +++ b/Gemfile.rails-7.1.lock @@ -70,19 +70,20 @@ GEM parser (3.3.1.0) ast (~> 2.4.1) racc - prism (0.27.0) + prism (0.29.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.7.3) + racc (1.8.0) rack (3.0.11) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -117,7 +118,7 @@ GEM rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -131,9 +132,9 @@ GEM rubocop-rspec_rails (~> 2.28) rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) - ruby-lsp (0.16.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.23.0, < 0.28) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) ruby-lsp-rails (0.3.6) ruby-lsp (>= 0.16.5, < 0.17.0) @@ -148,9 +149,14 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sorbet-runtime (0.5.11371) + sorbet-runtime (0.5.11391) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) + strscan (3.1.0) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) @@ -158,7 +164,11 @@ GEM unicode-display_width (2.5.0) PLATFORMS - x86_64-darwin-22 + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -180,4 +190,4 @@ DEPENDENCIES sqlite3 (~> 1.4) BUNDLED WITH - 2.4.19 + 2.5.10