From 67eedfb2f330c259cb82e79bc9e4ab7d9cdcad09 Mon Sep 17 00:00:00 2001 From: Homu Date: Tue, 15 Nov 2016 09:39:53 +0900 Subject: 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) --- lib/bundler/dependency.rb | 8 +++++++- man/gemfile.5.ronn | 8 ++++++++ spec/bundler/dsl_spec.rb | 4 ++-- 3 files changed, 17 insertions(+), 3 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| 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 -- cgit v1.2.1 From 489fc359462929ec6bd793f0e71fc4883dd5ad94 Mon Sep 17 00:00:00 2001 From: Homu Date: Thu, 17 Nov 2016 03:42:12 +0900 Subject: Auto merge of #5175 - biow0lf:biow0lf-fix-typo, r=segiddins Fix x64_mingw_24. Typo in PR #5170 (cherry picked from commit 6e0dcf48ee70314e42a65dcfd1f81c1494646d91) --- man/gemfile.5.ronn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn index e06e14fafc..27b95b7337 100644 --- a/man/gemfile.5.ronn +++ b/man/gemfile.5.ronn @@ -235,7 +235,7 @@ 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_24`: _x64_mingw_ `AND` version 2.4 As with groups, you can specify one or more platforms: -- cgit v1.2.1 From 018f9b81948a99bead40a0f91d8384b9dd4a80f2 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sun, 25 Dec 2016 08:42:46 -0600 Subject: Version 1.13.7 with changelog --- CHANGELOG.md | 6 ++++++ lib/bundler/version.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c02361f9e6..e495dbf99c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.13.7 (2016-12-25) + +Features: + + - add support for the `ruby_24` gemfile filter (#5281, @amatsuda) + ## 1.13.6 (2016-10-22) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 9cd9fb0064..1f1a2ee09b 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,5 +7,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.13.6" unless defined?(::Bundler::VERSION) + VERSION = "1.13.7" unless defined?(::Bundler::VERSION) end -- cgit v1.2.1