From 503f643ddf1c2c1077f94a869c4d698784e95aeb Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Tue, 10 Oct 2023 10:00:36 -0600 Subject: [PATCH] bundle update bundler-multilock --- .github/workflows/push.yml | 4 +- Gemfile | 6 +- Gemfile.activerecord-7.1.lock | 119 ---------------------------------- Gemfile.lock | 74 ++++++++++++++------- 4 files changed, 54 insertions(+), 149 deletions(-) delete mode 100644 Gemfile.activerecord-7.1.lock diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e6145cd..0d9e001 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: ruby-version: [2.7, "3.0", 3.1, 3.2] - lockfile: ['Gemfile.activerecord-6.1.lock', 'Gemfile.activerecord-7.0.lock', 'Gemfile.activerecord-7.1.lock'] + lockfile: ['Gemfile.activerecord-6.1.lock', 'Gemfile.activerecord-7.0.lock', 'Gemfile.lock'] steps: - uses: actions/checkout@v3 @@ -26,4 +26,4 @@ jobs: - name: Run tests run: bundle check env: - BUNDLE_LOCKFILE: ${{ matrix.lockfile }} \ No newline at end of file + BUNDLE_LOCKFILE: ${{ matrix.lockfile }} diff --git a/Gemfile b/Gemfile index 716a6bf..ec5a186 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org/' -plugin "bundler-multilock", "1.0.11" +plugin "bundler-multilock", "1.2.0" return unless Plugin.installed?("bundler-multilock") Plugin.send(:load_plugin, "bundler-multilock") @@ -17,7 +17,7 @@ lockfile "activerecord-7.0" do gem "railties", "~> 7.0.0" end -lockfile "activerecord-7.1" do +lockfile do gem "activerecord", "~> 7.1.0" gem "railties", "~> 7.1.0" -end \ No newline at end of file +end diff --git a/Gemfile.activerecord-7.1.lock b/Gemfile.activerecord-7.1.lock deleted file mode 100644 index 5486b8c..0000000 --- a/Gemfile.activerecord-7.1.lock +++ /dev/null @@ -1,119 +0,0 @@ -PATH - remote: . - specs: - guardrail (3.0.3) - activerecord (>= 6.1, < 7.2) - railties (>= 6.1, < 7.2) - -GEM - remote: https://rubygems.org/ - specs: - actionpack (7.1.0) - actionview (= 7.1.0) - activesupport (= 7.1.0) - nokogiri (>= 1.8.5) - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - actionview (7.1.0) - activesupport (= 7.1.0) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activemodel (7.1.0) - activesupport (= 7.1.0) - activerecord (7.1.0) - activemodel (= 7.1.0) - activesupport (= 7.1.0) - timeout (>= 0.4.0) - activesupport (7.1.0) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - base64 (0.1.1) - bigdecimal (3.1.4) - builder (3.2.4) - concurrent-ruby (1.2.2) - connection_pool (2.4.1) - crass (1.0.6) - debug (1.8.0) - irb (>= 1.5.0) - reline (>= 0.3.1) - drb (2.1.1) - ruby2_keywords - erubi (1.12.0) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.8.1) - rdoc - reline (>= 0.3.8) - loofah (2.21.3) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mini_portile2 (2.8.4) - minitest (5.20.0) - mutex_m (0.1.2) - nokogiri (1.15.4) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - psych (5.1.0) - stringio - racc (1.7.1) - rack (3.0.8) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rackup (2.1.0) - rack (>= 3) - webrick (~> 1.8) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.1.0) - actionpack (= 7.1.0) - activesupport (= 7.1.0) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - rake (13.0.6) - rdoc (6.5.0) - psych (>= 4.0.0) - reline (0.3.9) - io-console (~> 0.5) - ruby2_keywords (0.0.5) - stringio (3.0.8) - thor (1.2.2) - timeout (0.4.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - webrick (1.8.1) - zeitwerk (2.6.12) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord (~> 7.1.0) - debug - guardrail! - railties (~> 7.1.0) - -BUNDLED WITH - 2.4.19 diff --git a/Gemfile.lock b/Gemfile.lock index bc6c43f..5486b8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,35 +8,48 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) - rack (~> 2.0, >= 2.2.4) + actionpack (7.1.0) + actionview (= 7.1.0) + activesupport (= 7.1.0) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.0) + activesupport (= 7.1.0) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activemodel (7.1.0) + activesupport (= 7.1.0) + activerecord (7.1.0) + activemodel (= 7.1.0) + activesupport (= 7.1.0) + timeout (>= 0.4.0) + activesupport (7.1.0) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) + base64 (0.1.1) + bigdecimal (3.1.4) builder (3.2.4) concurrent-ruby (1.2.2) + connection_pool (2.4.1) crass (1.0.6) debug (1.8.0) irb (>= 1.5.0) reline (>= 0.3.1) + drb (2.1.1) + ruby2_keywords erubi (1.12.0) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -47,18 +60,23 @@ GEM loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) mini_portile2 (2.8.4) minitest (5.20.0) + mutex_m (0.1.2) nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) psych (5.1.0) stringio racc (1.7.1) - rack (2.2.8) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -66,30 +84,36 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - method_source + railties (7.1.0) + actionpack (= 7.1.0) + activesupport (= 7.1.0) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rake (13.0.6) rdoc (6.5.0) psych (>= 4.0.0) reline (0.3.9) io-console (~> 0.5) + ruby2_keywords (0.0.5) stringio (3.0.8) thor (1.2.2) + timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) + webrick (1.8.1) zeitwerk (2.6.12) PLATFORMS ruby DEPENDENCIES + activerecord (~> 7.1.0) debug guardrail! + railties (~> 7.1.0) BUNDLED WITH 2.4.19