Merge pull request #402 from rock-core/pin_bundler_version

fix: pin bundler version on ruby < 3
rock-core · Jan 8, 2024 · 1499946 · 1499946
2 parents 47e93f1 + bd9c0d1
commit 1499946
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/autoproj.gemspec b/autoproj.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "tty-spinner", "~> 0.9.0"
     s.add_runtime_dependency "utilrb", "~> 3.0.0", ">= 3.0.0"
     s.add_runtime_dependency "xdg", "= 2.2.5"
-    s.add_development_dependency "aruba"
+    s.add_development_dependency "aruba", "~> 2.1.0"
     s.add_development_dependency "flexmock", "~> 2.0", ">= 2.0.0"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"

diff --git a/bin/autoproj_bootstrap b/bin/autoproj_bootstrap
@@ -760,7 +760,11 @@ require 'bundler/setup'
             end
 
             def self.default_bundler_version
-                "2.3.6" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
             end
 
             def save_config

diff --git a/bin/autoproj_install b/bin/autoproj_install
@@ -760,7 +760,11 @@ require 'bundler/setup'
             end
 
             def self.default_bundler_version
-                "2.3.6" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
             end
 
             def save_config

diff --git a/lib/autoproj/ops/install.rb b/lib/autoproj/ops/install.rb
@@ -750,7 +750,11 @@ def load_config
             end
 
             def self.default_bundler_version
-                "2.3.6" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6.0")
+                    "2.3.6"
+                elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
+                    "2.4.22"
+                end
             end
 
             def save_config