diff options
| author | Colby Swandale <me@colby.fyi> | 2018-09-19 09:42:05 +1000 |
|---|---|---|
| committer | Colby Swandale <me@colby.fyi> | 2018-09-19 09:42:45 +1000 |
| commit | c0f8ce3434d6774e3229bcef4b85309b57ebac2e (patch) | |
| tree | fe34e5baf46668bce8817638bdb20e6c752cb658 | |
| parent | db6acfa8f2a729056df3b4b72f274979b79a2cb2 (diff) | |
| parent | 1da10a61bff46ecdbd42f4f278acbe051b9c547b (diff) | |
| download | bundler-c0f8ce3434d6774e3229bcef4b85309b57ebac2e.tar.gz | |
merge v1.16.5
* 1-16-stable:
Version 1.16.5 with changelog
scope TruffleRuby platform specs to be RubyGems >= 2.1.0
Auto merge of #6689 - bundler:colby/fix-bundler-load-error, r=colby-swandale
Auto merge of #6695 - bundler:segiddins/6684-gvp-prefer-non-pres, r=colby-swandale
Auto merge of #6693 - eregon:truffleruby, r=colby-swandale
Auto merge of #6692 - eregon:simplify-autoload-require-deprecate, r=segiddins
Auto merge of #6688 - voxik:check-search, r=colby-swandale
Auto merge of #6682 - bundler:bundle_env_formatting, r=colby-swandale
Auto merge of #6675 - MaxLap:master, r=greysteil
Auto merge of #6669 - ChrisBr:fix_dep_proxy, r=segiddins
Auto merge of #6664 - greysteil:avoid-printing-git-error, r=colby-swandale
| -rw-r--r-- | CHANGELOG.md | 16 | ||||
| -rw-r--r-- | spec/other/bundle_ruby_spec.rb | 2 | ||||
| -rw-r--r-- | spec/other/platform_spec.rb | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a73c072752..fe051607ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## 1.16.5 (2018-09-18) + +Changes: + + - Add support for TruffleRuby (@eregon) + +Bugfixes: + + - Avoid printing git errors when checking the version on incorrectly packaged versions of Bundler ([#6453](https://github.com/bundler/bundler/issues/6453), @greysteil) + - Fix issue where Bundler does not check the given class when comparing equality in DepProxy (@ChrisBr) + - Handle `RangeNotSatisfiable` error in Compact Index (@MaxLap) + - Check for initialized `search` variable in `LazySpecification` (@voxik) + - Fix LoadError occurring in nested bundle exec calls ([#6537](https://github.com/bundler/bundler/issues/6537), @colby-swandale) + - Check that Bundler::Deprecate is not an autoload constant ([#6163](https://github.com/bundler/bundler/issues/6163), @eregon) + - Prefer non-pre-release versions when performing a `bundle update --patch` ([#6684](https://github.com/bundler/bundler/issues/6684), @segiddins) + ## 1.16.4 (2018-08-17) Changes: diff --git a/spec/other/bundle_ruby_spec.rb b/spec/other/bundle_ruby_spec.rb index bcb38a63ca..a7da9cbec9 100644 --- a/spec/other/bundle_ruby_spec.rb +++ b/spec/other/bundle_ruby_spec.rb @@ -54,7 +54,7 @@ RSpec.describe "bundle_ruby", :bundler => "< 2" do expect(out).to include("ruby 1.8.7 (rbx 1.2.4)") end - it "handles truffleruby" do + it "handles truffleruby", :rubygems => ">= 2.1.0" do gemfile <<-G source "file://#{gem_repo1}" ruby "2.5.1", :engine => 'truffleruby', :engine_version => '1.0.0-rc6' diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb index 3654b630df..ca74945563 100644 --- a/spec/other/platform_spec.rb +++ b/spec/other/platform_spec.rb @@ -149,7 +149,7 @@ G expect(out).to eq("ruby 1.8.7 (rbx 1.2.4)") end - it "handles truffleruby" do + it "handles truffleruby", :rubygems => ">= 2.1.0" do gemfile <<-G source "file://#{gem_repo1}" ruby "2.5.1", :engine => 'truffleruby', :engine_version => '1.0.0-rc6' |