Merge pull request #20 from tricknotes/update-ruby-versions

Update Ruby versions on Travis CI
eddiezane · Apr 4, 2017 · d06754f · d06754f
2 parents 68604e4 + 9c5608a
commit d06754f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 144 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 sudo: false
 language: ruby
 rvm:
-- 2.2.1
-- 2.0.0
-- 1.9.3
-before_script:
-- bundle install
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+  - 2.0.0
+  - 1.9.3
+before_install:
+  - gem install bundler
 gemfile:
   - gemfiles/mail_2.5.gemfile
   - gemfiles/mail_2.6.gemfile
diff --git a/Gemfile b/Gemfile
@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sendgrid-actionmailer.gemspec
 gemspec
+
+if RUBY_VERSION < '2'
+  gem 'public_suffix', '~> 1.4.6'
+  gem 'mime-types', '~> 2.99'
+end
diff --git a/gemfiles/mail_2.5.gemfile.lock b/gemfiles/mail_2.5.gemfile.lock
diff --git a/gemfiles/mail_2.6.gemfile.lock b/gemfiles/mail_2.6.gemfile.lock
diff --git a/sendgrid-actionmailer.gemspec b/sendgrid-actionmailer.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~>3.2.0'
+  spec.add_development_dependency 'rspec', '~>3.2'
   spec.add_development_dependency 'appraisal', '~> 2.1.0'
-  spec.add_development_dependency 'webmock', '~> 1.24.6'
+  spec.add_development_dependency 'webmock'
 end