diff --git a/Gemfile.lock b/Gemfile.lock index 8dff6dd..b06f318 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: mailcatcher (0.6.0) - activesupport (>= 3.0.0, < 5) + activesupport (>= 4.0.0, < 5) eventmachine (~> 1.0.0) haml (>= 3.1, < 4.1) mail (~> 2.3) @@ -41,13 +41,11 @@ GEM hike (1.2.3) i18n (0.6.9) json (1.8.1) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) + mail (2.6.0) + mime-types (>= 1.16, < 3) + mime-types (2.3) minitest (5.3.1) multi_json (1.9.2) - polyglot (0.3.5) rack (1.5.2) rack-protection (1.5.3) rack @@ -85,9 +83,6 @@ GEM rack (>= 1.0.0) thread_safe (0.3.4) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) tzinfo (1.2.1) thread_safe (~> 0.1) uglifier (2.5.0) diff --git a/lib/mail_catcher.rb b/lib/mail_catcher.rb index 2640ae4..917daf1 100644 --- a/lib/mail_catcher.rb +++ b/lib/mail_catcher.rb @@ -2,7 +2,7 @@ require "open3" require "optparse" require "rbconfig" -require "active_support/core_ext" +require "active_support" require "eventmachine" require "thin" diff --git a/mailcatcher.gemspec b/mailcatcher.gemspec index 25b2aea..18eed30 100644 --- a/mailcatcher.gemspec +++ b/mailcatcher.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.7' - s.add_dependency "activesupport", ">= 3.0.0", "< 5" + s.add_dependency "activesupport", ">= 4.0.0", "< 5" s.add_dependency "eventmachine", "~> 1.0.0" s.add_dependency "haml", ">= 3.1", "< 4.1" s.add_dependency "mail", "~> 2.3"