diff options
author | Akira Matsuda <ronnie@dio.jp> | 2016-11-15 07:34:17 +0900 |
---|---|---|
committer | Akira Matsuda <ronnie@dio.jp> | 2016-11-15 07:34:17 +0900 |
commit | 107fc58330ae32e369e96c3f5d357ce8746e3c6c (patch) | |
tree | b7f0cf54725ea62c1811bf10f791bf6c4dc51de7 | |
parent | 66f486474dad6a8c4a159b5d89e433bf55b287b2 (diff) | |
download | bundler-107fc58330ae32e369e96c3f5d357ce8746e3c6c.tar.gz |
Support :mri_23 platform and its variations
-rw-r--r-- | lib/bundler/dependency.rb | 6 | ||||
-rw-r--r-- | man/gemfile.5.ronn | 8 | ||||
-rw-r--r-- | spec/bundler/dsl_spec.rb | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 66162d741a..133c722228 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -17,6 +17,7 @@ module Bundler :ruby_21 => Gem::Platform::RUBY, :ruby_22 => Gem::Platform::RUBY, :ruby_23 => Gem::Platform::RUBY, + :ruby_24 => Gem::Platform::RUBY, :mri => Gem::Platform::RUBY, :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, @@ -24,6 +25,7 @@ module Bundler :mri_21 => Gem::Platform::RUBY, :mri_22 => Gem::Platform::RUBY, :mri_23 => Gem::Platform::RUBY, + :mri_24 => Gem::Platform::RUBY, :rbx => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, :jruby_18 => Gem::Platform::JAVA, @@ -35,12 +37,14 @@ module Bundler :mswin_21 => Gem::Platform::MSWIN, :mswin_22 => Gem::Platform::MSWIN, :mswin_23 => Gem::Platform::MSWIN, + :mswin_24 => Gem::Platform::MSWIN, :mswin64 => Gem::Platform::MSWIN64, :mswin64_19 => Gem::Platform::MSWIN64, :mswin64_20 => Gem::Platform::MSWIN64, :mswin64_21 => Gem::Platform::MSWIN64, :mswin64_22 => Gem::Platform::MSWIN64, :mswin64_23 => Gem::Platform::MSWIN64, + :mswin64_24 => Gem::Platform::MSWIN64, :mingw => Gem::Platform::MINGW, :mingw_18 => Gem::Platform::MINGW, :mingw_19 => Gem::Platform::MINGW, @@ -48,11 +52,13 @@ module Bundler :mingw_21 => Gem::Platform::MINGW, :mingw_22 => Gem::Platform::MINGW, :mingw_23 => Gem::Platform::MINGW, + :mingw_24 => 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_22 => Gem::Platform::X64_MINGW, :x64_mingw_23 => Gem::Platform::X64_MINGW, + :x64_mingw_24 => Gem::Platform::X64_MINGW }.freeze REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map| diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn index da2157e971..e06e14fafc 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -185,6 +185,8 @@ There are a number of `Gemfile` platforms: _ruby_ `AND` version 2.2 * `ruby_23`: _ruby_ `AND` version 2.3 + * `ruby_24`: + _ruby_ `AND` version 2.4 * `mri`: Same as _ruby_, but not Rubinius * `mri_18`: @@ -199,6 +201,8 @@ There are a number of `Gemfile` platforms: _mri_ `AND` version 2.2 * `mri_23`: _mri_ `AND` version 2.3 + * `mri_24`: + _mri_ `AND` version 2.4 * `rbx`: Same as _ruby_, but only Rubinius (not MRI) * `jruby`: @@ -219,6 +223,8 @@ There are a number of `Gemfile` platforms: _mingw_ `AND` version 2.2 * `mingw_23`: _mingw_ `AND` version 2.3 + * `mingw_24`: + _mingw_ `AND` version 2.4 * `x64_mingw`: Windows 64 bit 'mingw32' platform (aka RubyInstaller x64) * `x64_mingw_20`: @@ -229,6 +235,8 @@ There are a number of `Gemfile` platforms: _x64_mingw_ `AND` version 2.2 * `x64_mingw_23`: _x64_mingw_ `AND` version 2.3 + * `x65_mingw_23`: + _x64_mingw_ `AND` version 2.4 As with groups, you can specify one or more platforms: diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb index 00d36dd55f..e7df91c06f 100644 --- a/spec/bundler/dsl_spec.rb +++ b/spec/bundler/dsl_spec.rb @@ -93,8 +93,8 @@ describe Bundler::Dsl do end describe "#gem" do - [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :mri, :mri_18, :mri_19, - :mri_20, :mri_21, :mri_22, :mri_23, :jruby, :rbx].each do |platform| + [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :mri, :mri_18, :mri_19, + :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :jruby, :rbx].each do |platform| it "allows #{platform} as a valid platform" do subject.gem("foo", :platform => platform) end |