summaryrefslogtreecommitdiff
path: root/lib/bundler/dependency.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-08-15 18:37:14 -0700
committerAndre Arko <andre@arko.net>2012-08-15 18:37:14 -0700
commit2059012a5dbfb55ee2f6ebbf3a7650b1456126a3 (patch)
tree19603aec07aa057d6df50d0dfbe5bd2e1df4e7d6 /lib/bundler/dependency.rb
parent8acc82f39d03f9cf0bf1016debdc2e80fe4264fc (diff)
downloadbundler-2059012a5dbfb55ee2f6ebbf3a7650b1456126a3.tar.gz
Revert "Ruby 2.0 (trunk ruby) is not Ruby 1.9"
As discussed in #1539 and #2056, Bundler uses platforms to distinguish Ruby ABI versions. That means the known (and ATM supported) use cases for the ruby_19 platform include Ruby 2.0. This reverts commit dcfb640c2c78671a90ab10ce4c8d98a157ad975c.
Diffstat (limited to 'lib/bundler/dependency.rb')
-rw-r--r--lib/bundler/dependency.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 995b945af4..453d568e58 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -87,7 +87,7 @@ module Bundler
end
def ruby_19?
- ruby? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
+ ruby? && RUBY_VERSION >= "1.9"
end
def mri?
@@ -99,7 +99,7 @@ module Bundler
end
def mri_19?
- mri? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
+ mri? && RUBY_VERSION >= "1.9"
end
def rbx?