diff options
| author | Bobby McDonald <bobbymcwho@gmail.com> | 2022-04-13 11:42:52 -0400 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-04-16 08:23:21 +0900 |
| commit | ccb0572ff948aa83b7fb35143524fa8cd74864cf (patch) | |
| tree | 5f4cc3c31b5829fbf09ddae5068c22a1d59cf1d4 | |
| parent | 22f79ae3f749ebe31c34c22d5b8699ffd81ab341 (diff) | |
[rubygems/rubygems] Add modern rubies to the platforms
https://github.com/rubygems/rubygems/commit/5462322f8f
| -rw-r--r-- | lib/bundler/current_ruby.rb | 1 | ||||
| -rw-r--r-- | lib/bundler/dependency.rb | 18 | ||||
| -rw-r--r-- | spec/bundler/bundler/dsl_spec.rb | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index f84d68e262..27997982c0 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -21,6 +21,7 @@ module Bundler 2.6 2.7 3.0 + 3.1 ].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 94e85053dd..d12b120bba 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -20,6 +20,9 @@ module Bundler :ruby_24 => Gem::Platform::RUBY, :ruby_25 => Gem::Platform::RUBY, :ruby_26 => Gem::Platform::RUBY, + :ruby_27 => Gem::Platform::RUBY, + :ruby_30 => Gem::Platform::RUBY, + :ruby_31 => Gem::Platform::RUBY, :mri => Gem::Platform::RUBY, :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, @@ -30,6 +33,9 @@ module Bundler :mri_24 => Gem::Platform::RUBY, :mri_25 => Gem::Platform::RUBY, :mri_26 => Gem::Platform::RUBY, + :mri_27 => Gem::Platform::RUBY, + :mri_30 => Gem::Platform::RUBY, + :mri_31 => Gem::Platform::RUBY, :rbx => Gem::Platform::RUBY, :truffleruby => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, @@ -45,6 +51,9 @@ module Bundler :mswin_24 => Gem::Platform::MSWIN, :mswin_25 => Gem::Platform::MSWIN, :mswin_26 => Gem::Platform::MSWIN, + :mswin_27 => Gem::Platform::MSWIN, + :mswin_30 => Gem::Platform::MSWIN, + :mswin_31 => Gem::Platform::MSWIN, :mswin64 => Gem::Platform::MSWIN64, :mswin64_19 => Gem::Platform::MSWIN64, :mswin64_20 => Gem::Platform::MSWIN64, @@ -54,6 +63,9 @@ module Bundler :mswin64_24 => Gem::Platform::MSWIN64, :mswin64_25 => Gem::Platform::MSWIN64, :mswin64_26 => Gem::Platform::MSWIN64, + :mswin64_27 => Gem::Platform::MSWIN64, + :mswin64_30 => Gem::Platform::MSWIN64, + :mswin64_31 => Gem::Platform::MSWIN64, :mingw => Gem::Platform::MINGW, :mingw_18 => Gem::Platform::MINGW, :mingw_19 => Gem::Platform::MINGW, @@ -64,6 +76,9 @@ module Bundler :mingw_24 => Gem::Platform::MINGW, :mingw_25 => Gem::Platform::MINGW, :mingw_26 => Gem::Platform::MINGW, + :mingw_27 => Gem::Platform::MINGW, + :mingw_30 => Gem::Platform::MINGW, + :mingw_31 => Gem::Platform::MINGW, :x64_mingw => Gem::Platform::X64_MINGW, :x64_mingw_20 => Gem::Platform::X64_MINGW, :x64_mingw_21 => Gem::Platform::X64_MINGW, @@ -72,6 +87,9 @@ module Bundler :x64_mingw_24 => Gem::Platform::X64_MINGW, :x64_mingw_25 => Gem::Platform::X64_MINGW, :x64_mingw_26 => Gem::Platform::X64_MINGW, + :x64_mingw_27 => Gem::Platform::X64_MINGW, + :x64_mingw_30 => Gem::Platform::X64_MINGW, + :x64_mingw_31 => Gem::Platform::X64_MINGW, }.freeze def initialize(name, version, options = {}, &blk) diff --git a/spec/bundler/bundler/dsl_spec.rb b/spec/bundler/bundler/dsl_spec.rb index a44a12924c..4802b62a58 100644 --- a/spec/bundler/bundler/dsl_spec.rb +++ b/spec/bundler/bundler/dsl_spec.rb @@ -137,8 +137,9 @@ RSpec.describe Bundler::Dsl do end describe "#gem" do - [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25, :ruby_26, :mri, :mri_18, :mri_19, - :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :mri_25, :mri_26, :jruby, :rbx, :truffleruby].each do |platform| + [:ruby, :ruby_18, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25, :ruby_26, :ruby_27, + :ruby_30, :ruby_31, :mri, :mri_18, :mri_19, :mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :mri_25, :mri_26, + :mri_27, :mri_30, :mri_31, :jruby, :rbx, :truffleruby].each do |platform| it "allows #{platform} as a valid platform" do subject.gem("foo", :platform => platform) end |