diff options
| author | Homu <homu@barosl.com> | 2016-11-15 09:39:53 +0900 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-12-25 08:40:59 -0600 |
| commit | 67eedfb2f330c259cb82e79bc9e4ab7d9cdcad09 (patch) | |
| tree | 49b03aa3e1963c7d0c9789eee37a451344eee6e3 /lib/bundler/dependency.rb | |
| parent | a79a6385640be23b46e2f6151424cec940d67486 (diff) | |
| download | bundler-67eedfb2f330c259cb82e79bc9e4ab7d9cdcad09.tar.gz | |
Auto merge of #5170 - amatsuda:mri_24, r=segiddins
Support :mri_24 platform
Current ruby trunk is versioned as "2.4.0".
% ruby -ve 'p RUBY_VERSION'
ruby 2.4.0dev (2016-11-15 trunk 56792) [x86_64-darwin15]
"2.4.0"
We'd like to run tests on some gems against ruby-trunk or 2.4 pre-releases, so here's a support for MRI 2.4.
(This is Ruby 2.4 version of #3865)
(cherry picked from commit aa9414e78f527ee2066d21783abb7d52a55f68a9)
Diffstat (limited to 'lib/bundler/dependency.rb')
| -rw-r--r-- | lib/bundler/dependency.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 1b1808b40a..7b4ae44ef8 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_23 => Gem::Platform::X64_MINGW, + :x64_mingw_24 => Gem::Platform::X64_MINGW, }.freeze REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map| |