Merge pull request #5966 from deivid-rodriguez/remove_config_map_usages

Remove usages of deprecated ConfigMap
jruby · Dec 2, 2019 · aa5048f · aa5048f
2 parents 3e8b5d1 + 75c4889
commit aa5048f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/ruby/stdlib/rubygems/defaults/jruby.rb b/lib/ruby/stdlib/rubygems/defaults/jruby.rb
@@ -31,15 +31,15 @@ def self.platform_defaults
   # to preserve the old location: lib/ruby/gems.
   def self.default_dir
     dir = RbConfig::CONFIG["default_gem_home"]
-    dir ||= File.join(ConfigMap[:libdir], 'ruby', 'gems', 'shared')
+    dir ||= File.join(RbConfig::CONFIG['libdir'], 'ruby', 'gems', 'shared')
     dir
   end
 
   # Default locations for RubyGems' .rb and bin files
   def self.default_rubygems_dirs
     [
-        File.join(ConfigMap[:libdir], 'ruby', 'stdlib'),
-        ConfigMap[:bindir]
+        File.join(RbConfig::CONFIG['libdir'], 'ruby', 'stdlib'),
+        RbConfig::CONFIG['bindir']
     ]
   end
 

diff --git a/test/mri/lib/envutil.rb b/test/mri/lib/envutil.rb
@@ -291,7 +291,6 @@ class << self
     end
     dir = File.dirname(ruby)
     CONFIG['bindir'] = dir
-    Gem::ConfigMap[:bindir] = dir if defined?(Gem::ConfigMap)
   end
 end