Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usages of deprecated ConfigMap #5966

Merged
merged 2 commits into from Dec 2, 2019
Merged

Remove usages of deprecated ConfigMap #5966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
637b17c
Remove usages of deprecated ConfigMap
deivid-rodriguez Nov 8, 2019
75c4889
I don't think this is needed either
deivid-rodriguez Nov 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ruby/stdlib/rubygems/defaults/jruby.rb
View file
Open in desktop
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion test/mri/lib/envutil.rb
View file
Open in desktop
Expand Up @@ -291,7 +291,6 @@ class << self
end
dir = File.dirname(ruby)
CONFIG['bindir'] = dir
Gem::ConfigMap[:bindir] = dir if defined?(Gem::ConfigMap)
end
end

Expand Down