summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2023-12-13 05:01:24 -0800
committergit <svn-admin@ruby-lang.org>2023-12-13 19:02:24 +0000
commit6aa26af683616cf908f0251dbb8ffde380e0c314 (patch)
tree22ed4473d1d2a33e1194e046ad5707319ce45151
parent110dbf62acc307ea2e3ce57ddaa89fc734a715c5 (diff)
[rubygems/rubygems] Add 3.4 as a supported ruby version
Since ruby trunk will be 3.4 very soon https://github.com/rubygems/rubygems/commit/36dd9a35dc
-rw-r--r--lib/bundler/dependency.rb2
-rw-r--r--spec/bundler/bundler/dependency_spec.rb11
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index ae0a35ad69..efc39a12f3 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -9,7 +9,7 @@ module Bundler
attr_reader :autorequire
attr_reader :groups, :platforms, :gemfile, :path, :git, :github, :branch, :ref
- ALL_RUBY_VERSIONS = ((18..27).to_a + (30..33).to_a).freeze
+ ALL_RUBY_VERSIONS = (18..27).to_a.concat((30..34).to_a).freeze
PLATFORM_MAP = {
ruby: [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
mri: [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
diff --git a/spec/bundler/bundler/dependency_spec.rb b/spec/bundler/bundler/dependency_spec.rb
index 52a85f45b4..a953372742 100644
--- a/spec/bundler/bundler/dependency_spec.rb
+++ b/spec/bundler/bundler/dependency_spec.rb
@@ -55,6 +55,7 @@ RSpec.describe Bundler::Dependency do
ruby_31: Gem::Platform::RUBY,
ruby_32: Gem::Platform::RUBY,
ruby_33: Gem::Platform::RUBY,
+ ruby_34: Gem::Platform::RUBY,
mri: Gem::Platform::RUBY,
mri_18: Gem::Platform::RUBY,
mri_19: Gem::Platform::RUBY,
@@ -70,6 +71,7 @@ RSpec.describe Bundler::Dependency do
mri_31: Gem::Platform::RUBY,
mri_32: Gem::Platform::RUBY,
mri_33: Gem::Platform::RUBY,
+ mri_34: Gem::Platform::RUBY,
rbx: Gem::Platform::RUBY,
truffleruby: Gem::Platform::RUBY,
jruby: Gem::Platform::JAVA,
@@ -89,7 +91,8 @@ RSpec.describe Bundler::Dependency do
windows_30: Gem::Platform::WINDOWS,
windows_31: Gem::Platform::WINDOWS,
windows_32: Gem::Platform::WINDOWS,
- windows_33: Gem::Platform::WINDOWS }
+ windows_33: Gem::Platform::WINDOWS,
+ windows_34: Gem::Platform::WINDOWS }
end
let(:deprecated) do
@@ -108,6 +111,7 @@ RSpec.describe Bundler::Dependency do
mswin_31: Gem::Platform::MSWIN,
mswin_32: Gem::Platform::MSWIN,
mswin_33: Gem::Platform::MSWIN,
+ mswin_34: Gem::Platform::MSWIN,
mswin64: Gem::Platform::MSWIN64,
mswin64_19: Gem::Platform::MSWIN64,
mswin64_20: Gem::Platform::MSWIN64,
@@ -122,6 +126,7 @@ RSpec.describe Bundler::Dependency do
mswin64_31: Gem::Platform::MSWIN64,
mswin64_32: Gem::Platform::MSWIN64,
mswin64_33: Gem::Platform::MSWIN64,
+ mswin64_34: Gem::Platform::MSWIN64,
mingw: Gem::Platform::MINGW,
mingw_18: Gem::Platform::MINGW,
mingw_19: Gem::Platform::MINGW,
@@ -137,6 +142,7 @@ RSpec.describe Bundler::Dependency do
mingw_31: Gem::Platform::MINGW,
mingw_32: Gem::Platform::MINGW,
mingw_33: Gem::Platform::MINGW,
+ mingw_34: Gem::Platform::MINGW,
x64_mingw: Gem::Platform::X64_MINGW,
x64_mingw_20: Gem::Platform::X64_MINGW,
x64_mingw_21: Gem::Platform::X64_MINGW,
@@ -149,7 +155,8 @@ RSpec.describe Bundler::Dependency do
x64_mingw_30: Gem::Platform::X64_MINGW,
x64_mingw_31: Gem::Platform::X64_MINGW,
x64_mingw_32: Gem::Platform::X64_MINGW,
- x64_mingw_33: Gem::Platform::X64_MINGW }
+ x64_mingw_33: Gem::Platform::X64_MINGW,
+ x64_mingw_34: Gem::Platform::X64_MINGW }
end
# rubocop:enable Naming/VariableNumber