Merge rubygems/bundler HEAD

  Merge from https://github.com/rubygems/rubygems/commit/2af2520b4a7ab1c6eb1fdc3d2ef4d8c062d96ad7

1 files changed, 1 insertions, 4 deletions

diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 2449cb6411..7f94079e09 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require "rubygems/dependency"
-require_relative "force_platform"
 require_relative "shared_helpers"
 require_relative "rubygems_ext"
 
 module Bundler
   class Dependency < Gem::Dependency
-    include ForcePlatform
-
     attr_reader :autorequire
     attr_reader :groups, :platforms, :gemfile, :git, :github, :branch, :ref, :force_ruby_platform
 
@@ -112,7 +109,7 @@ module Bundler
       @env            = options["env"]
       @should_include = options.fetch("should_include", true)
       @gemfile        = options["gemfile"]
-      @force_ruby_platform = options.fetch("force_ruby_platform", default_force_ruby_platform)
+      @force_ruby_platform = options["force_ruby_platform"]
 
       @autorequire = Array(options["require"] || []) if options.key?("require")
     end