summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Coles <alex@alexbcoles.com>2014-12-30 12:25:01 +0000
committerAlex Coles <alex@alexbcoles.com>2014-12-30 13:55:47 +0000
commit3472286166e1626fbfbf5d3bbe16e22e9cea496f (patch)
tree07004b9536d77593920b0f01e269b82c8a474a09
parentf264260095782e85befbeee7569b508147c57e57 (diff)
downloadbundler-3472286166e1626fbfbf5d3bbe16e22e9cea496f.tar.gz
Teach Bundler to recognize mri_22 platform
See e6bc48eb. Signed-off-by: Alex Coles <alex@alexbcoles.com>
-rw-r--r--lib/bundler/dependency.rb1
-rw-r--r--man/gemfile.5.ronn2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 675e2fb9fe..e366d36493 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -20,6 +20,7 @@ module Bundler
:mri_19 => Gem::Platform::RUBY,
:mri_20 => Gem::Platform::RUBY,
:mri_21 => Gem::Platform::RUBY,
+ :mri_22 => Gem::Platform::RUBY,
:rbx => Gem::Platform::RUBY,
:jruby => Gem::Platform::JAVA,
:jruby_18 => Gem::Platform::JAVA,
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index e84c0f5228..291ed88e72 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -193,6 +193,8 @@ There are a number of `Gemfile` platforms:
_mri_ `AND` version 2.0
* `mri_21`:
_mri_ `AND` version 2.1
+ * `mri_22`:
+ _mri_ `AND` version 2.2
* `rbx`:
Same as _ruby_, but only Rubinius (not MRI)
* `jruby`: