From b3bf10fee898b49e3ce08a721fbd2c628330340e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 23 Apr 2019 18:33:05 +0200 Subject: [PATCH] Make hack a bit clearer --- lib/bundler/rubygems_integration.rb | 4 ++++ lib/bundler/version.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 81bac3540ec..81f5a6649ae 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -317,6 +317,10 @@ def stubs_provide_full_functionality? provides?(">= 2.5.2") end + def has_bundler_version_finder? + provides?(">= 2.7.0") + end + def replace_gem(specs, specs_by_name) reverse_rubygems_kernel_mixin diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index c7385cd1154..9a6e71f59c9 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -1,7 +1,9 @@ # frozen_string_literal: false +require_relative "rubygems_integration" + module Bundler - if Gem::Requirement.new(">= 2.7.0").satisfied_by?(Gem::Version.create(Gem::VERSION)) + if Bundler.rubygems.has_bundler_version_finder? VERSION = "2.1.0.pre.1".freeze else # We're doing this because we might write tests that deal