From 0419f5b80e487d267f4935a3ce55947cdaa7e936 Mon Sep 17 00:00:00 2001
From: Robert Mosolgo <rdmosolgo@gmail.com>
Date: Fri, 4 Jan 2019 16:17:03 -0500
Subject: [PATCH] Try removing incompatible guard-bundler

---
 .travis.yml     | 7 ++-----
 Guardfile       | 5 -----
 graphql.gemspec | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4ea9038fe..c2fefc9022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,8 @@ env:
     - CODECLIMATE_REPO_TOKEN=f5b27b2e25d3f4e199bb2566fb4fd4507144a004c71d4aa33a32c2df5f940333
 
 before_install:
-  - bundle --version
-  - gem uninstall bundler --force
-  - bundle --version || echo 'no bundler'
-  - gem install bundler -v '< 2'
-  - bundle --version
+  - gem update --system
+  - gem install bundler
 
 install: bundle install --jobs=3 --retry=3 --without=jekyll_plugins
 
diff --git a/Guardfile b/Guardfile
index a4dc8b0a4c..25400bdcdf 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,9 +1,4 @@
 # frozen_string_literal: true
-guard :bundler do
-  watch("Gemfile")
-  # Uncomment next line if your Gemfile contains the `gemspec' command.
-  watch(/^.+\.gemspec/)
-end
 
 guard :minitest, test_file_patterns: ["*_spec.rb"] do
   # with Minitest::Spec
diff --git a/graphql.gemspec b/graphql.gemspec
index 59f879a776..34a6a09352 100644
--- a/graphql.gemspec
+++ b/graphql.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "codeclimate-test-reporter", "~>0.4"
   s.add_development_dependency "concurrent-ruby", "~>1.0"
   s.add_development_dependency "guard", "~> 2.12"
-  s.add_development_dependency "guard-bundler", "~> 2.1"
   s.add_development_dependency "guard-minitest", "~> 2.4"
   s.add_development_dependency "guard-rake"
   s.add_development_dependency "guard-rubocop"