Skip to content

Commit

Permalink
Merge pull request #66 from qw4n7y/relaxing-dependencies-to-support-r…
Browse files Browse the repository at this point in the history
…ails-5

Relaxing dependency requirements to support Rails 5
  • Loading branch information
Fivell committed Jul 4, 2016
2 parents f857e43 + a29cf1e commit c3c2957
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 4 deletions.
13 changes: 13 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ rvm:
- 2.2.5
- 2.3.1
- jruby-19mode # JRuby in 1.9 mode
gemfile:
- gemfiles/rails1-4.gemfile
- gemfiles/rails5.gemfile
matrix:
exclude:
- gemfile: gemfiles/rails5.gemfile
rvm: 1.9.3
- gemfile: gemfiles/rails5.gemfile
rvm: 2.0.0
- gemfile: gemfiles/rails5.gemfile
rvm: 2.1.9
- gemfile: gemfiles/rails5.gemfile
rvm: jruby-19mode
before_install:
- gem install bundler -v '= 1.11.2'
- gem update --system
Expand Down
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 3.2.2
* Relaxing dependency requirements to support Rails 5

# 3.2.1
* Improved support for new Mastercard range (222100 – 272099)

Expand Down
6 changes: 3 additions & 3 deletions credit_card_validations.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ Gem::Specification.new do |gem|
gem.summary = "gem should be used for credit card numbers validation, card brands detections, luhn checks"
gem.homepage = "http://fivell.github.io/credit_card_validations/"
gem.license = 'MIT'

gem.files = `git ls-files`.split($/)
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]


gem.add_dependency "activemodel", ">= 3", "< 5"
gem.add_dependency "activesupport", ">= 3", "< 5"
gem.add_dependency "activemodel", ">= 3"
gem.add_dependency "activesupport", ">= 3"


gem.add_development_dependency "mocha", '1.1.0'
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/rails1-4.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source "https://rubygems.org"

gem "activemodel", ">= 3", '< 5'
gem "activesupport", ">= 3", '< 5'

group :test do
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
end

gemspec :path => "../"
10 changes: 10 additions & 0 deletions gemfiles/rails5.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source "https://rubygems.org"

gem "activemodel", ">= 5"
gem "activesupport", ">= 5"

group :test do
gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
end

gemspec :path => "../"
2 changes: 1 addition & 1 deletion lib/credit_card_validations/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module CreditCardValidations
VERSION = '3.2.1'
VERSION = '3.2.2'
end

0 comments on commit c3c2957

Please sign in to comment.