From 93bc64c739c3ea2ce4fb25261ec7808340c245b8 Mon Sep 17 00:00:00 2001
From: Andrew Bromwich <a.bromwich@gmail.com>
Date: Sat, 5 Jan 2019 16:01:13 +1000
Subject: [PATCH] Fix Travis CI builds (#30)

* Bump allowed bundler version
* Drop support for Ruby 2.1
---
 .travis.yml        | 6 +++---
 rocketchat.gemspec | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 559fc41..bb47e19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,18 +5,18 @@ env:
 language: ruby
 
 rvm:
-  - 2.1
   - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
 
 before_install:
   - gem update bundler
 
 install:
   - bundle install --jobs=3 --retry=3
-  - if [[ ! `ruby --version` =~ ^ruby\ 2\.1 ]]; then gem install rubocop; fi
+  - gem install rubocop
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
@@ -24,7 +24,7 @@ before_script:
   - ./cc-test-reporter before-build
 
 script:
-  - if [[ ! `ruby --version` =~ ^ruby\ 2\.1 ]]; then rubocop; fi
+  - rubocop
   - bundle exec rake
 
 after_script:
diff --git a/rocketchat.gemspec b/rocketchat.gemspec
index 499bd8c..908ff1b 100644
--- a/rocketchat.gemspec
+++ b/rocketchat.gemspec
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', ['>= 1.11', '< 3.0']
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.57'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.27'
+  spec.add_development_dependency 'rubocop', '~> 0.62'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.31'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'webmock', '~> 2.3'
   spec.add_development_dependency 'yard', '~> 0.9.11'