diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-21 09:22:15 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-21 09:22:15 +0000 |
| commit | 4525cf2cd599389be3fab30ae4c13e22050705b5 (patch) | |
| tree | 33165c2a9ec72863caa8c476e380e36eeb9c6a69 /lib | |
| parent | 85277d5be0b24638ea4bf84c422e71a1219465e7 (diff) | |
Merge release version of bundler-1.16.1 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler.gemspec | 7 | ||||
| -rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/bundler.gemspec b/lib/bundler.gemspec index fdc1a5cea9..227191b090 100644 --- a/lib/bundler.gemspec +++ b/lib/bundler.gemspec @@ -1,10 +1,9 @@ # coding: utf-8 # frozen_string_literal: true -version = File.expand_path("../lib/bundler/version", __FILE__) -if File.file?(version) - require version -else # for Ruby core repository +begin + require File.expand_path("../lib/bundler/version", __FILE__) +rescue LoadError # for Ruby core repository require File.expand_path("../bundler/version", __FILE__) end require "shellwords" diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index bfc6b91576..052d776183 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -306,6 +306,8 @@ module Bundler :solver_name => "Bundler", :possibility_type => "gem", :reduce_trees => lambda do |trees| + # bail out if tree size is too big for Array#combination to make any sense + return trees if trees.size > 15 maximal = 1.upto(trees.size).map do |size| trees.map(&:last).flatten(1).combination(size).to_a end.flatten(1).select do |deps| diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 87cc8e3776..87b648681a 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,7 +7,7 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.16.1.pre1" unless defined?(::Bundler::VERSION) + VERSION = "1.16.1" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin |