summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorTony Miller <mcfiredrill@gmail.com>2013-08-24 10:00:52 -0700
committerTony Miller <mcfiredrill@gmail.com>2013-08-24 10:00:52 -0700
commitc8797067660b648f3d68d1142f126d52b892a27f (patch)
treee39b1e5697e97cf4f4078b95c115e4d277418d74 /lib/bundler
parentd66ac64f3a7d326cf19532e5898aa6fe3a22a332 (diff)
downloadbundler-c8797067660b648f3d68d1142f126d52b892a27f.tar.gz
add jruby_18 and jruby_19 to platforms
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/current_ruby.rb8
-rw-r--r--lib/bundler/dependency.rb2
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index c35f55036c..7b187eebb5 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -60,6 +60,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 f29b1a9584..9e17fe0eb8 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -19,6 +19,8 @@ module Bundler
:mri_20 => 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,