diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2023-10-26 22:12:02 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-11-13 11:06:10 +0900 |
commit | 50482cd1e5542f210565440bed7586821f774a29 (patch) | |
tree | 78ea56dcf75b96116fc6bb5fd3dd4b6cfdd72316 /spec/bundler/support/helpers.rb | |
parent | 54511303a46901a82e9b2d4ee460b2048e59a2e5 (diff) | |
download | ruby-50482cd1e5542f210565440bed7586821f774a29.tar.gz |
[rubygems/rubygems] Drop support for Ruby 2.6 and Ruby 2.7 in Bundler
https://github.com/rubygems/rubygems/commit/93619c97ff
Diffstat (limited to 'spec/bundler/support/helpers.rb')
-rw-r--r-- | spec/bundler/support/helpers.rb | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index f4dd6fc89b..88f34a7028 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -464,32 +464,12 @@ module Spec old = ENV["BUNDLER_SPEC_WINDOWS"] ENV["BUNDLER_SPEC_WINDOWS"] = "true" simulate_platform platform do - simulate_bundler_version_when_missing_prerelease_default_gem_activation do - yield - end + yield end ensure ENV["BUNDLER_SPEC_WINDOWS"] = old end - def simulate_bundler_version_when_missing_prerelease_default_gem_activation - return yield unless rubygems_version_failing_to_activate_bundler_prereleases - - old = ENV["BUNDLER_VERSION"] - ENV["BUNDLER_VERSION"] = Bundler::VERSION - yield - ensure - ENV["BUNDLER_VERSION"] = old - end - - def env_for_missing_prerelease_default_gem_activation - if rubygems_version_failing_to_activate_bundler_prereleases - { "BUNDLER_VERSION" => Bundler::VERSION } - else - {} - end - end - def current_ruby_minor Gem.ruby_version.segments.tap {|s| s.delete_at(2) }.join(".") end @@ -508,12 +488,6 @@ module Spec Gem.ruby_version.segments[0..1] end - # versions not including - # https://github.com/rubygems/rubygems/commit/929e92d752baad3a08f3ac92eaec162cb96aedd1 - def rubygems_version_failing_to_activate_bundler_prereleases - Gem.rubygems_version < Gem::Version.new("3.1.0.pre.1") - end - def revision_for(path) sys_exec("git rev-parse HEAD", :dir => path).strip end |