From 874622417bcd6be53648321c9cb3dc0818dc8224 Mon Sep 17 00:00:00 2001
From: Jeffrey Martin <Jeffrey_Martin@rapid7.com>
Date: Wed, 26 Feb 2020 16:30:44 -0600
Subject: [PATCH 1/2] relax i18n gem restirctions

To allow installation on newer version of vagrant and since this at least the second time this has occurred see #273, remove the upper limit on `i18n` gem.

Also bump the ruby and bundler version in travis to allow testing with newer gems.
---
 .ruby-version   | 2 +-
 .travis.yml     | 4 ++--
 vSphere.gemspec | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index cc6c9a49..57cf282e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.5
+2.6.5
diff --git a/.travis.yml b/.travis.yml
index 7f2e6a8b..c529c4ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.5
+  - 2.6.5
 
 before_install:
   - rvm @global do gem uninstall bundler --all --executables
   - gem uninstall bundler --all --executables
-  - gem install bundler --version '1.15.4'
+  - gem install bundler --version '1.17.2'
 
 sudo: false
diff --git a/vSphere.gemspec b/vSphere.gemspec
index 402244aa..111687c4 100644
--- a/vSphere.gemspec
+++ b/vSphere.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rbvmomi', '>=1.11.5', '<2.0.0'
 
-  s.add_dependency 'i18n', '>=0.6.4', '<=1.1.1'
+  s.add_dependency 'i18n', '>=0.6.4'
 
   s.add_development_dependency 'rake', '11.1.2' # pinned to accommodate rubocop 0.32.1
   s.add_development_dependency 'rspec-core'

From e57d74ebb06cf31c88d76089cb01fb2da220ffe9 Mon Sep 17 00:00:00 2001
From: Jeffrey Martin <Jeffrey_Martin@rapid7.com>
Date: Wed, 26 Feb 2020 16:41:11 -0600
Subject: [PATCH 2/2] bundler is now vendored with ruby do not remove

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c529c4ba..0a05f2e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ rvm:
   - 2.6.5
 
 before_install:
-  - rvm @global do gem uninstall bundler --all --executables
-  - gem uninstall bundler --all --executables
   - gem install bundler --version '1.17.2'
 
 sudo: false