Skip to content

Commit

Permalink
bundle update bundler-multilock
Browse files Browse the repository at this point in the history
  • Loading branch information
@ccutrer
ccutrer committed Oct 10, 2023
1 parent c8afb4c commit d756f60
Show file tree
Hide file tree
Showing 8 changed files with 268 additions and 398 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ jobs:
- Gemfile.activerecord-6.0.lock
- Gemfile.activerecord-6.1.lock
- Gemfile.activerecord-7.0.lock
- Gemfile.activerecord-7.1.lock
env:
BUNDLE_LOCKFILE: ${{ matrix.lockfile }}
- Gemfile.lock
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '${{ matrix.ruby }}'
- name: Install dependencies
run: bundle install
rubygems: latest
bundler-cache: true
- name: Run tests
run: bundle exec rake
env:
BUNDLE_LOCKFILE: ${{ matrix.lockfile }}

13 changes: 5 additions & 8 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,19 @@

source 'http://rubygems.org'

plugin 'bundler-multilock', '1.1.2'
plugin 'bundler-multilock', '1.2.0'
return unless Plugin.installed?('bundler-multilock')

Plugin.send(:load_plugin, 'bundler-multilock')

gemspec

group :test do
end

%w[6.0 6.1 7.0 7.1].each do |ar|
lockfile "activerecord-#{ar}" do
lockfile_name = "activerecord-#{ar}" unless ar == "7.1"
lockfile lockfile_name do
gem "globalid", ar == "6.0" ? "~> 1.1.0" : "~> 1.2"
# rspec-rails depends on basically all of rails, so just use all of rails here
gem 'rails', "~> #{ar}.0"
if ar == "6.0"
gem 'rspec-rails', "~> 5.1.2"
end
gem 'rspec-rails', ar == "6.0" ? "~> 5.1.2" : "~> 6.0"
end
end
25 changes: 14 additions & 11 deletions Gemfile.activerecord-6.0.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
once-ler (2.0.1)
once-ler (2.0.2)
activerecord (>= 6.0, < 7.2)
rspec (>= 3.6)
rspec-rails (>= 4.0)
Expand Down Expand Up @@ -64,10 +64,6 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
appraisal (2.3.0)
bundler
rake
thor (>= 0.14.0)
builder (3.2.4)
concurrent-ruby (1.2.2)
crass (1.0.6)
Expand Down Expand Up @@ -101,18 +97,22 @@ GEM
net-smtp
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.20.0)
net-imap (0.3.6)
net-imap (0.4.1)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
psych (5.1.0)
Expand Down Expand Up @@ -189,19 +189,22 @@ GEM
timeout (0.4.0)
tzinfo (1.2.11)
thread_safe (~> 0.1)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-22
arm64-darwin
ruby
x86_64-darwin
x86_64-linux

DEPENDENCIES
appraisal (~> 2.3.0)
database_cleaner (~> 2.0)
database_cleaner-active_record (~> 2.0)
debug
globalid (~> 1.1.0)
once-ler!
rails (~> 6.0.0)
rake
Expand Down
140 changes: 74 additions & 66 deletions Gemfile.activerecord-6.1.lock
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,73 @@
PATH
remote: .
specs:
once-ler (2.0.1)
once-ler (2.0.2)
activerecord (>= 6.0, < 7.2)
rspec (>= 3.6)
rspec-rails (>= 4.0)

GEM
remote: http://rubygems.org/
specs:
actioncable (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (>= 2.7.1)
actionmailer (6.1.7.3)
actionpack (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.3)
actionview (= 6.1.7.3)
activesupport (= 6.1.7.3)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.3)
actionpack (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
nokogiri (>= 1.8.5)
actionview (6.1.7.3)
activesupport (= 6.1.7.3)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.3)
activesupport (= 6.1.7.3)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
globalid (>= 0.3.6)
activemodel (6.1.7.3)
activesupport (= 6.1.7.3)
activerecord (6.1.7.3)
activemodel (= 6.1.7.3)
activesupport (= 6.1.7.3)
activestorage (6.1.7.3)
actionpack (= 6.1.7.3)
activejob (= 6.1.7.3)
activerecord (= 6.1.7.3)
activesupport (= 6.1.7.3)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.3)
activesupport (6.1.7.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
appraisal (2.3.0)
bundler
rake
thor (>= 0.14.0)
builder (3.2.4)
concurrent-ruby (1.2.2)
crass (1.0.6)
Expand All @@ -87,8 +83,8 @@ GEM
reline (>= 0.3.1)
diff-lcs (1.5.0)
erubi (1.12.0)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-console (0.6.0)
Expand All @@ -105,40 +101,48 @@ GEM
net-smtp
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.20.0)
net-imap (0.3.6)
net-imap (0.4.1)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
psych (5.1.0)
stringio
racc (1.7.1)
rack (2.2.8)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.3)
actioncable (= 6.1.7.3)
actionmailbox (= 6.1.7.3)
actionmailer (= 6.1.7.3)
actionpack (= 6.1.7.3)
actiontext (= 6.1.7.3)
actionview (= 6.1.7.3)
activejob (= 6.1.7.3)
activemodel (= 6.1.7.3)
activerecord (= 6.1.7.3)
activestorage (= 6.1.7.3)
activesupport (= 6.1.7.3)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
bundler (>= 1.15.0)
railties (= 6.1.7.3)
railties (= 6.1.7.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
Expand All @@ -147,9 +151,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.3)
actionpack (= 6.1.7.3)
activesupport (= 6.1.7.3)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand Down Expand Up @@ -192,22 +196,26 @@ GEM
timeout (0.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-22
arm64-darwin
ruby
x86_64-darwin
x86_64-linux

DEPENDENCIES
appraisal (~> 2.3.0)
database_cleaner (~> 2.0)
database_cleaner-active_record (~> 2.0)
debug
globalid (~> 1.2)
once-ler!
rails (~> 6.1.0)
rake
rspec-rails (~> 6.0)
sqlite3 (~> 1.4.2)

BUNDLED WITH
Expand Down
Loading

0 comments on commit d756f60

Please sign in to comment.