From 8c152451861a311395d56f1009abbf0c32e1bad1 Mon Sep 17 00:00:00 2001 From: djsegal Date: Fri, 11 Dec 2015 16:27:13 -0500 Subject: [PATCH] Reduce dependencies to allow Rails 5.0: #458 --- Gemfile.lock | 12 +++++++----- devise_token_auth.gemspec | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8e3f0b0b..95a688414 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ PATH specs: devise_token_auth (0.1.37.beta4) devise (~> 3.5.2) - rails (~> 4.2) + rails (< 6) GEM remote: https://rubygems.org/ @@ -86,7 +86,8 @@ GEM codeclimate-test-reporter (0.4.8) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.0) - devise (3.5.2) + concurrent-ruby (1.0.0) + devise (3.5.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -132,7 +133,7 @@ GEM mime-types (>= 1.16, < 3) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.6.2) + mime-types (2.99) mini_portile (0.6.2) minitest (5.8.1) minitest-focus (1.1.2) @@ -220,7 +221,8 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - sprockets (3.4.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) @@ -263,4 +265,4 @@ DEPENDENCIES thor BUNDLED WITH - 1.10.5 + 1.10.6 diff --git a/devise_token_auth.gemspec b/devise_token_auth.gemspec index a4a9d2801..fb0ae933f 100644 --- a/devise_token_auth.gemspec +++ b/devise_token_auth.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*"] s.test_files.reject! { |file| file.match(/[.log|.sqlite3]$/) } - s.add_dependency "rails", "~> 4.2" + s.add_dependency "rails", "< 6" s.add_dependency "devise", "~> 3.5.2" s.add_development_dependency "sqlite3", "~> 1.3"