summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Coles <alex@alexbcoles.com>2014-12-30 14:01:03 +0000
committerAlex Coles <alex@alexbcoles.com>2014-12-30 14:01:03 +0000
commit17b2186b8efa3843f82635a4663892cf826f11d4 (patch)
tree9cbc58805d55dc7253013b3a0d1d5f7c0ca3e4ed
parent3472286166e1626fbfbf5d3bbe16e22e9cea496f (diff)
downloadbundler-17b2186b8efa3843f82635a4663892cf826f11d4.tar.gz
Teach Bundler to recognize (x64_)mingw_22 platform
See e6bc48eb. Signed-off-by: Alex Coles <alex@alexbcoles.com>
-rw-r--r--lib/bundler/dependency.rb4
-rw-r--r--man/gemfile.5.ronn4
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index e366d36493..0224c3feca 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -31,9 +31,11 @@ module Bundler
:mingw_19 => Gem::Platform::MINGW,
:mingw_20 => Gem::Platform::MINGW,
:mingw_21 => Gem::Platform::MINGW,
+ :mingw_22 => Gem::Platform::MINGW,
:x64_mingw => Gem::Platform::X64_MINGW,
:x64_mingw_20 => Gem::Platform::X64_MINGW,
- :x64_mingw_21 => Gem::Platform::X64_MINGW
+ :x64_mingw_21 => Gem::Platform::X64_MINGW,
+ :x64_mingw_22 => Gem::Platform::X64_MINGW
}.freeze
def initialize(name, version, options = {}, &blk)
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index 291ed88e72..88d6f0ffa7 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -211,12 +211,16 @@ There are a number of `Gemfile` platforms:
_mingw_ `AND` version 2.0
* `mingw_21`:
_mingw_ `AND` version 2.1
+ * `mingw_22`:
+ _mingw_ `AND` version 2.2
* `x64_mingw`:
Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
* `x64_mingw_20`:
_x64_mingw_ `AND` version 2.0
* `x64_mingw_21`:
_x64_mingw_ `AND` version 2.1
+ * `x64_mingw_22`:
+ _x64_mingw_ `AND` version 2.2
As with groups, you can specify one or more platforms: