From d681311e53025a14ec3e4d06cab43a0981cbf657 Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Thu, 23 Feb 2017 18:39:25 -0500 Subject: [PATCH 1/2] Loosen Rails version restriction Allow Rails 5.1 applications to use JBuilder. --- jbuilder.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbuilder.gemspec b/jbuilder.gemspec index 49c6d86..fe6ad6c 100644 --- a/jbuilder.gemspec +++ b/jbuilder.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9.3' - s.add_dependency 'activesupport', '>= 3.0.0', '< 5.1' + s.add_dependency 'activesupport', '>= 3.0.0', '< 5.2' s.add_dependency 'multi_json', '~> 1.2' s.files = `git ls-files`.split("\n") From a1d0d10e6ec08b594f19bfd18cd6d044ddada72a Mon Sep 17 00:00:00 2001 From: Jon Moss Date: Thu, 23 Feb 2017 18:44:25 -0500 Subject: [PATCH 2/2] Add Rails 5.1 to Appraisals and Travis CI build --- .travis.yml | 11 +++++++++++ Appraisals | 6 ++++++ gemfiles/rails_5_1.gemfile | 13 +++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 gemfiles/rails_5_1.gemfile diff --git a/.travis.yml b/.travis.yml index 652f53f..f865e6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ gemfile: - gemfiles/rails_4_1.gemfile - gemfiles/rails_4_2.gemfile - gemfiles/rails_5_0.gemfile + - gemfiles/rails_5_1.gemfile matrix: allow_failures: @@ -32,14 +33,24 @@ matrix: exclude: - rvm: 1.9 gemfile: gemfiles/rails_5_0.gemfile + - rvm: 1.9 + gemfile: gemfiles/rails_5_1.gemfile - rvm: 2.0 gemfile: gemfiles/rails_5_0.gemfile + - rvm: 2.0 + gemfile: gemfiles/rails_5_1.gemfile - rvm: 2.1 gemfile: gemfiles/rails_5_0.gemfile + - rvm: 2.1 + gemfile: gemfiles/rails_5_1.gemfile - rvm: jruby-19mode gemfile: gemfiles/rails_5_0.gemfile + - rvm: jruby-19mode + gemfile: gemfiles/rails_5_1.gemfile - rvm: rbx gemfile: gemfiles/rails_5_0.gemfile + - rvm: rbx + gemfile: gemfiles/rails_5_1.gemfile - rvm: 2.4.0 gemfile: gemfiles/rails_3_0.gemfile - rvm: 2.4.0 diff --git a/Appraisals b/Appraisals index c15aa76..c5552d0 100644 --- a/Appraisals +++ b/Appraisals @@ -42,3 +42,9 @@ appraise "rails-5-0" do gem "actionpack", "~> 5.0.0" gem "activemodel", "~> 5.0.0" end + +appraise "rails-5-1" do + gem "railties", ">= 5.1.0.beta1", "< 5.2" + gem "actionpack", ">= 5.1.0.beta1", "< 5.2" + gem "activemodel", ">= 5.1.0.beta1", "< 5.2" +end diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile new file mode 100644 index 0000000..1550cff --- /dev/null +++ b/gemfiles/rails_5_1.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "mocha", :require => false +gem "appraisal" +gem "pry" +gem "railties", ">= 5.1.0.beta1", "< 5.2" +gem "actionpack", ">= 5.1.0.beta1", "< 5.2" +gem "activemodel", ">= 5.1.0.beta1", "< 5.2" + +gemspec :path => "../"