From c5f4cce4f12ddd443afd22d57bffd6e0c80f3e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 3 Jan 2022 12:08:09 +0100 Subject: [PATCH 1/2] Add support for Ruby 3.1 The biggest change comming with Ruby 3.1 is that net/ftp is no longer bundled with Ruby but distributed as a separate gem. --- vagrant.gemspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index 85d5f0b8b..dee377288 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.summary = "Build and distribute virtualized development environments." s.description = "Vagrant is a tool for building and distributing virtualized development environments." - s.required_ruby_version = ">= 2.6", "< 3.1" + s.required_ruby_version = ">= 2.6", "< 3.2" s.required_rubygems_version = ">= 1.3.6" s.add_dependency "bcrypt_pbkdf", "~> 1.1" @@ -26,6 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "listen", "~> 3.6" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" s.add_dependency "mime-types", "~> 3.3" + s.add_dependency "net-ftp", "~> 0.1" s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2" s.add_dependency "net-sftp", "~> 3.0" s.add_dependency "net-scp", "~> 3.0.0" @@ -42,6 +43,9 @@ Gem::Specification.new do |s| # Needed for go generate to use grpc_tools_ruby_protoc s.add_development_dependency "grpc-tools", "~> 1.41.1" + # required to include https://github.com/ruby/ipaddr/issues/35 + s.add_dependency "ipaddr", ">= 1.2.4" + # Constraint rake to properly handle deprecated method usage # from within rspec s.add_development_dependency "rake", "~> 13.0" From 91bbefaffabceacc6eaab42fb1181033ecbf4e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 3 Jan 2022 12:08:27 +0100 Subject: [PATCH 2/2] Add Ruby 3.1 to the CI --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7ab98b49f..7e4f89da2 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-18.04 strategy: matrix: - ruby: [ '2.6', '2.7', '3.0' ] + ruby: [ '2.6', '2.7', '3.0', '3.1' ] name: Vagrant unit tests on Ruby ${{ matrix.ruby }} steps: - name: Code Checkout