diff options
author | Akira Matsuda <ronnie@dio.jp> | 2016-12-26 09:19:49 +0900 |
---|---|---|
committer | Akira Matsuda <ronnie@dio.jp> | 2016-12-26 19:15:03 +0900 |
commit | cf107b4fbadf2fa4523822149624e99b24cbcf41 (patch) | |
tree | 1e3d37e9fa76f314d3cf866674824ecdc3223ff7 | |
parent | 8b5bf94f2f7666d4547b7fbe4719f2e840df4914 (diff) | |
download | bundler-cf107b4fbadf2fa4523822149624e99b24cbcf41.tar.gz |
Support :mri_25 platform and its variations
-rw-r--r-- | lib/bundler/current_ruby.rb | 1 | ||||
-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 |
4 files changed, 17 insertions, 2 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index 7b3d87e320..145518bacc 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -16,6 +16,7 @@ module Bundler 2.2 2.3 2.4 + 2.5 ).freeze KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 7b4ae44ef8..d2bac66cdb 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -18,6 +18,7 @@ module Bundler :ruby_22 => Gem::Platform::RUBY, :ruby_23 => Gem::Platform::RUBY, :ruby_24 => Gem::Platform::RUBY, + :ruby_25 => Gem::Platform::RUBY, :mri => Gem::Platform::RUBY, :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, @@ -26,6 +27,7 @@ module Bundler :mri_22 => Gem::Platform::RUBY, :mri_23 => Gem::Platform::RUBY, :mri_24 => Gem::Platform::RUBY, + :mri_25 => Gem::Platform::RUBY, :rbx => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, :jruby_18 => Gem::Platform::JAVA, @@ -38,6 +40,7 @@ module Bundler :mswin_22 => Gem::Platform::MSWIN, :mswin_23 => Gem::Platform::MSWIN, :mswin_24 => Gem::Platform::MSWIN, + :mswin_25 => Gem::Platform::MSWIN, :mswin64 => Gem::Platform::MSWIN64, :mswin64_19 => Gem::Platform::MSWIN64, :mswin64_20 => Gem::Platform::MSWIN64, @@ -45,6 +48,7 @@ module Bundler :mswin64_22 => Gem::Platform::MSWIN64, :mswin64_23 => Gem::Platform::MSWIN64, :mswin64_24 => Gem::Platform::MSWIN64, + :mswin64_25 => Gem::Platform::MSWIN64, :mingw => Gem::Platform::MINGW, :mingw_18 => Gem::Platform::MINGW, :mingw_19 => Gem::Platform::MINGW, @@ -53,12 +57,14 @@ module Bundler :mingw_22 => Gem::Platform::MINGW, :mingw_23 => Gem::Platform::MINGW, :mingw_24 => Gem::Platform::MINGW, + :mingw_25 => 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, + :x64_mingw_25 => 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 27b95b7337..08a3ded488 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -187,6 +187,8 @@ There are a number of `Gemfile` platforms: _ruby_ `AND` version 2.3 * `ruby_24`: _ruby_ `AND` version 2.4 + * `ruby_25`: + _ruby_ `AND` version 2.5 * `mri`: Same as _ruby_, but not Rubinius * `mri_18`: @@ -203,6 +205,8 @@ There are a number of `Gemfile` platforms: _mri_ `AND` version 2.3 * `mri_24`: _mri_ `AND` version 2.4 + * `mri_25`: + _mri_ `AND` version 2.5 * `rbx`: Same as _ruby_, but only Rubinius (not MRI) * `jruby`: @@ -225,6 +229,8 @@ There are a number of `Gemfile` platforms: _mingw_ `AND` version 2.3 * `mingw_24`: _mingw_ `AND` version 2.4 + * `mingw_25`: + _mingw_ `AND` version 2.5 * `x64_mingw`: Windows 64 bit 'mingw32' platform (aka RubyInstaller x64) * `x64_mingw_20`: @@ -237,6 +243,8 @@ There are a number of `Gemfile` platforms: _x64_mingw_ `AND` version 2.3 * `x64_mingw_24`: _x64_mingw_ `AND` version 2.4 + * `x64_mingw_25`: + _x64_mingw_ `AND` version 2.5 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 e7df91c06f..bd5d94318d 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, :ruby_24, :mri, :mri_18, :mri_19, - :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :jruby, :rbx].each do |platform| + [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25, :mri, :mri_18, :mri_19, + :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :mri_25, :jruby, :rbx].each do |platform| it "allows #{platform} as a valid platform" do subject.gem("foo", :platform => platform) end |