From 700b415d8d6281ace0aa098ac1901d7785503978 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Thu, 31 Oct 2019 08:15:03 -0700 Subject: [PATCH] Relax dependencies to support rails 6 --- .travis.yml | 1 + Gemfile | 1 + sir_trevor_rails.gemspec | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48ebae0..48b532a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,6 @@ rvm: - 2.1.0 - 2.2.5 - 2.3.1 + - 2.6.5 script: 'bundle exec rake test' diff --git a/Gemfile b/Gemfile index d94e7f4..67126fe 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,5 @@ gemspec if RUBY_VERSION < '2.2' gem 'rack', '< 2' gem 'rails', '< 5' + gem 'sqlite3', '~> 1.3.0' end diff --git a/sir_trevor_rails.gemspec b/sir_trevor_rails.gemspec index 24298d3..3ca7e3d 100644 --- a/sir_trevor_rails.gemspec +++ b/sir_trevor_rails.gemspec @@ -24,17 +24,17 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.4" + spec.add_development_dependency "bundler", ">= 1.4" spec.add_development_dependency "rake" spec.add_development_dependency "minitest", "~> 5.3" spec.add_development_dependency "wrong" spec.add_development_dependency "pry-rails" spec.add_development_dependency "combustion" - spec.add_development_dependency "sqlite3", "~> 1.3.6" + spec.add_development_dependency "sqlite3", ">= 1.3", "< 1.5" spec.add_development_dependency "capybara" spec.add_development_dependency "launchy" - spec.add_dependency "rails", ">= 3", "< 6" + spec.add_dependency "rails", ">= 3", "< 7" spec.add_dependency "redcarpet", ">= 2.0.1", "< 4" spec.add_dependency "twitter-text", "~> 1.4" spec.add_dependency 'multi_json', '~> 1.0'