From c7fd8c812c2114904764b671ab7836864a099e40 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Fri, 28 Apr 2017 11:41:02 -0700 Subject: [PATCH] Allow Rails 5.1 --- .travis.yml | 2 ++ braintree-rails.gemspec | 4 ++-- gemfiles/Gemfile.rails-5.1 | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gemfiles/Gemfile.rails-5.1 diff --git a/.travis.yml b/.travis.yml index d786ce4..59d0b09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,6 @@ matrix: include: - rvm: 2.2.2 gemfile: gemfiles/Gemfile.rails-5.0 + - rvm: 2.4.1 + gemfile: gemfilres/Gemfilre.rails-5.1 diff --git a/braintree-rails.gemspec b/braintree-rails.gemspec index 1f62491..b5e63d0 100644 --- a/braintree-rails.gemspec +++ b/braintree-rails.gemspec @@ -13,8 +13,8 @@ Gem::Specification.new do |spec| spec.homepage = 'https://github.com/lyang/braintree-rails' spec.required_ruby_version = '>= 1.9.2' spec.add_runtime_dependency 'braintree', '>= 2.28.0', '< 3' - spec.add_runtime_dependency 'activemodel', '>= 3.0', '< 5.1' - spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 5.1' + spec.add_runtime_dependency 'activemodel', '>= 3.0', '< 5.2' + spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 5.2' spec.add_development_dependency 'rake', '~> 10' spec.add_development_dependency 'rspec', '~> 3' spec.add_development_dependency 'webmock', '~> 1' diff --git a/gemfiles/Gemfile.rails-5.1 b/gemfiles/Gemfile.rails-5.1 new file mode 100644 index 0000000..edfd215 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.1 @@ -0,0 +1,18 @@ +source 'https://rubygems.org' + +gemspec path: ".." + +gem 'braintree', '>= 2.28.0' +gem 'activemodel', github: 'rails/rails', branch: '5-1-stable' +gem 'activesupport', github: 'rails/rails', branch: '5-1-stable' +gem 'activerecord', github: 'rails/rails', branch: '5-1-stable' + +gem 'activemodel-serializers-xml', '~> 1.0.1' + +group :test do + gem 'rake' + gem 'rspec' + gem 'webmock' + gem 'pry' + gem 'coveralls', require: false +end