Skip to content

Commit

Permalink
Only support Rails 4.2 and 5. Remove foreigner
Browse files Browse the repository at this point in the history
  • Loading branch information
t27duck committed Jul 3, 2016
1 parent d86062f commit 74bbbcd
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 41 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ cache: bundler
sudo: false

rvm:
- 2.0
- 2.1.10
- 2.2.5
- 2.3.1

gemfile:
- gemfiles/rails3.2.gemfile
- gemfiles/rails4.0.gemfile
- gemfiles/rails4.1.gemfile
- gemfiles/rails4.2.gemfile
- gemfiles/rails5.0.gemfile

matrix:
exclude:
- rvm: 2.1.10
gemfile: gemfiles/rails5.0.gemfile

env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
12 changes: 2 additions & 10 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
appraise "rails3.2" do
gem "rails", "~> 3.2.21"
end

appraise "rails4.0" do
gem "rails", "~> 4.0.13"
end

appraise "rails4.1" do
gem "rails", "~> 4.1.13"
appraise "rails4.2" do
gem "rails", "~> 4.2.6"
end
8 changes: 0 additions & 8 deletions gemfiles/rails3.2.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails4.0.gemfile

This file was deleted.

7 changes: 0 additions & 7 deletions gemfiles/rails4.1.gemfile

This file was deleted.

7 changes: 7 additions & 0 deletions gemfiles/rails5.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 5.0.0"

gemspec path: "../"
2 changes: 0 additions & 2 deletions lib/mailboxer/engine.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Database foreign keys
require 'foreigner' if Rails.version < "4.2.0"
require 'carrierwave'
begin
require 'sunspot_rails'
Expand Down
4 changes: 1 addition & 3 deletions mailboxer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ Gem::Specification.new do |s|

# Gem dependencies
#
# SQL foreign keys
s.add_runtime_dependency('foreigner', '>= 0.9.1')

# Development Gem dependencies
s.add_runtime_dependency('rails', '>= 3.2.0')
s.add_runtime_dependency('rails', '>= 4.2.0')
s.add_runtime_dependency('carrierwave', '>= 0.5.8')

if RUBY_ENGINE == "rbx" && RUBY_VERSION >= "2.1.0"
Expand Down

0 comments on commit 74bbbcd

Please sign in to comment.