summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-08-15 18:37:14 -0700
committerTerence Lee <hone02@gmail.com>2012-08-30 01:58:58 -0500
commit41e7cc2eff48aa0c998f0c4e45eb9e70d5fb2228 (patch)
treefed5353a939271e798840b4fd73c0d4bb315e8ab
parente0c44514efbd73dbe4a8b60a5a9795d5f5ba2004 (diff)
downloadbundler-41e7cc2eff48aa0c998f0c4e45eb9e70d5fb2228.tar.gz
Revert "Ruby 2.0 (trunk ruby) is not Ruby 1.9"v1.2.0
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.
-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?