Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore compatibility with bundler 2.4.19 #10

Merged
merged 1 commit into from
Oct 6, 2023
Merged

restore compatibility with bundler 2.4.19 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
bundler-multilock (1.1.0)
bundler-multilock (1.1.1)
bundler (~> 2.4.19)

GEM
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/multilock.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes:
definition.send(:source_map).locked_specs.each do |spec|
next if spec.match_platform(Bundler.local_platform)

spec.source.specs.add(spec)
spec.source.specs << spec
end
definition.resolve_with_cache!
rescue GemNotFound, SolveFailure
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/multilock/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Bundler
module Multilock
VERSION = "1.1.0"
VERSION = "1.1.1"
end
end
8 changes: 4 additions & 4 deletions spec/bundler/multilock_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

source "https://rubygems.org"

plugin "bundler-multilock", "~> 1.0"
plugin "bundler-multilock", "~> 1.1"
return unless Plugin.installed?("bundler-multilock")

Plugin.send(:load_plugin, "bundler-multilock")
Expand All @@ -52,7 +52,7 @@

source 'https://rubygems.org'

plugin 'bundler-multilock', '~> 1.0'
plugin 'bundler-multilock', '~> 1.1'
return unless Plugin.installed?('bundler-multilock')

Plugin.send(:load_plugin, 'bundler-multilock')
Expand Down Expand Up @@ -81,7 +81,7 @@
RUBY

File.write("injected.rb", <<~RUBY)
plugin "bundler-multilock", "~> 1.0", path: #{File.expand_path("../..", __dir__).inspect}
plugin "bundler-multilock", "~> 1.1", path: #{File.expand_path("../..", __dir__).inspect}
return unless Plugin.installed?("bundler-multilock")

Plugin.send(:load_plugin, "bundler-multilock")
Expand Down Expand Up @@ -740,7 +740,7 @@ def write_gemfile(content)
File.write("Gemfile", <<~RUBY)
source "https://rubygems.org"

plugin "bundler-multilock", "~> 1.0", path: #{File.expand_path("../..", __dir__).inspect}
plugin "bundler-multilock", "~> 1.1", path: #{File.expand_path("../..", __dir__).inspect}
return unless Plugin.installed?("bundler-multilock")

Plugin.send(:load_plugin, "bundler-multilock")
Expand Down