diff options
| author | André Arko <andre@arko.net> | 2013-09-26 12:17:34 -0700 |
|---|---|---|
| committer | André Arko <andre@arko.net> | 2013-09-26 12:17:34 -0700 |
| commit | f4e0464282426a2ec65ac4d6e3675b0a3498be61 (patch) | |
| tree | 6de9df03ce2b72311588851345d129023b8681ae | |
| parent | 35355a854bd967ed5da72fe8ea92d3c5ff335665 (diff) | |
| parent | c8797067660b648f3d68d1142f126d52b892a27f (diff) | |
| download | bundler-f4e0464282426a2ec65ac4d6e3675b0a3498be61.tar.gz | |
Merge pull request #2611 from mcfiredrill/jruby18and19
add jruby_18 and jruby_19 to platforms
| -rw-r--r-- | lib/bundler/current_ruby.rb | 8 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index ae075d3456..8d012a03d7 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -71,6 +71,14 @@ module Bundler defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" end + def jruby_18? + jruby? && on_18? + end + + def jruby_19? + jruby? && on_19? + end + def maglev? defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev" end diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 889f934627..1b09ed74c5 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -21,6 +21,8 @@ module Bundler :mri_21 => Gem::Platform::RUBY, :rbx => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, + :jruby_18 => Gem::Platform::JAVA, + :jruby_19 => Gem::Platform::JAVA, :mswin => Gem::Platform::MSWIN, :mingw => Gem::Platform::MINGW, :mingw_18 => Gem::Platform::MINGW, |