From fa43561765f16e5e980fb4f04c28b5289e5dcda8 Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Fri, 15 Feb 2019 19:27:18 +0530 Subject: [PATCH 1/2] Remove workaround for ruby 2.5.0 to fix travis builds --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b407c87..cf12a26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,3 @@ matrix: gemfile: gemfiles/rails_60.gemfile notifications: email: false - -# for 2.5.0 until 2.5.1 is released: -# https://github.com/travis-ci/travis-ci/issues/8978 -# https://github.com/travis-ci/travis-ci/issues/8969#issuecomment-354135622 -before_install: - - gem update --system - - gem install bundler From c44529725f7b12e9b3240d1ee01fff77e3265b98 Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Fri, 15 Feb 2019 19:46:01 +0530 Subject: [PATCH 2/2] Relax bundler dependency --- telegram-bot.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram-bot.gemspec b/telegram-bot.gemspec index fcb36b6..9aae4cf 100644 --- a/telegram-bot.gemspec +++ b/telegram-bot.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'activesupport', '>= 4.0', '< 6.0' spec.add_dependency 'httpclient', '~> 2.7' - spec.add_development_dependency 'bundler', '~> 1.16' + spec.add_development_dependency 'bundler', '> 1.16' spec.add_development_dependency 'rake', '~> 10.0' end