Merge pull request #135 from renz45/mandrill-api-fork

Use my fork of the mandrill-api gem to support json 2.x+
renz45 · Oct 8, 2018 · 78da302 · 78da302
2 parents e8d39ac + 3a552e5
commit 78da302
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.7.0 - 2018-10-06
+- Switch to mandrillus fork of the mandrill-api gem to allow for newer
+json gem support
+
 ## 1.6.0 - 2017-03-23
 - Add support for attaching unencoded content via @brunomperes
 

diff --git a/lib/mandrill_mailer/version.rb b/lib/mandrill_mailer/version.rb
@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end
diff --git a/mandrill_mailer.gemspec b/mandrill_mailer.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = MandrillMailer::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Adam Rensel"]
-  s.email       = ["adamrensel@codeschool.com"]
+  s.email       = ["adamrensel@gmail.com"]
   s.homepage    = "https://github.com/renz45/mandrill_mailer"
   s.summary     = %q{Transactional Mailer for Mandrill}
   s.description = %q{Transactional Mailer for Mandrill}
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport'
   s.add_dependency 'actionpack'
   s.add_dependency 'activejob'
-  s.add_runtime_dependency 'mandrill-api', '~> 1.0.9'
+  s.add_runtime_dependency 'mandrillus', '~> 2.0.0'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec'