diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5772e6..43f4d60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,19 @@ jobs: fail-fast: false matrix: ruby-version: [2.7, "3.0", 3.1, 3.2] - + bundler-version: [2.4.20, 2.5.1] + exclude: + - ruby-version: 2.7 + bundler-version: 2.5.1 + env: + BUNDLER_VERSION: ${{ matrix.bundler-version }} steps: - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} + bundler: ${{ matrix.bundler-version }} bundler-cache: true - name: Run tests run: bin/rspec @@ -33,7 +39,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: "3.0" bundler-cache: true - name: Run RuboCop run: bin/rubocop diff --git a/Gemfile.lock b/Gemfile.lock index cb7d5bc..587f2c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - bundler-multilock (1.2.0) - bundler (~> 2.4.19) + bundler-multilock (1.2.1) + bundler (>= 2.4.19, < 2.6) GEM remote: https://rubygems.org/ @@ -98,4 +98,4 @@ DEPENDENCIES rubocop-rspec (~> 2.24) BUNDLED WITH - 2.4.20 + 2.5.1 diff --git a/bundler-multilock.gemspec b/bundler-multilock.gemspec index 7dc096a..cdf70db 100644 --- a/bundler-multilock.gemspec +++ b/bundler-multilock.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 2.7" - spec.add_dependency "bundler", "~> 2.4.19" + spec.add_dependency "bundler", ">= 2.4.19", "< 2.6" spec.add_development_dependency "debug", "~> 1.8" spec.add_development_dependency "rake", "~> 13.0" diff --git a/lib/bundler/multilock/lockfile_generator.rb b/lib/bundler/multilock/lockfile_generator.rb index 3e7ba4e..7f8011f 100644 --- a/lib/bundler/multilock/lockfile_generator.rb +++ b/lib/bundler/multilock/lockfile_generator.rb @@ -32,6 +32,10 @@ def dependencies def locked_ruby_version ruby_version end + + def locked_checksums + checksums + end end private_constant :LockfileAdapter diff --git a/lib/bundler/multilock/version.rb b/lib/bundler/multilock/version.rb index 4fd5042..378039a 100644 --- a/lib/bundler/multilock/version.rb +++ b/lib/bundler/multilock/version.rb @@ -2,6 +2,6 @@ module Bundler module Multilock - VERSION = "1.2.0" + VERSION = "1.2.1" end end diff --git a/spec/bundler/multilock_spec.rb b/spec/bundler/multilock_spec.rb index ee1061f..6203dac 100644 --- a/spec/bundler/multilock_spec.rb +++ b/spec/bundler/multilock_spec.rb @@ -723,6 +723,7 @@ lockfile("alt") {} RUBY + invoke_bundler("config set --local force_ruby_platform true") # workaround for https://github.com/rubygems/rubygems/issues/7304 invoke_bundler("install") write_gemfile(<<~RUBY)