diff --git a/.travis.yml b/.travis.yml index f06c8f7..53d497e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ before_install: - gem install bundler -v "~> 2.0" gemfile: - - gemfiles/rack_2_0.gemfile - - gemfiles/rack_1_6.gemfile + - gemfiles/rack_2.gemfile + - gemfiles/rack_1.gemfile - gemfiles/rails_6_0.gemfile - gemfiles/rails_5_2.gemfile - gemfiles/rails_5_1.gemfile @@ -33,7 +33,7 @@ matrix: allow_failures: - rvm: ruby-head exclude: - - gemfile: gemfiles/rack_1_6.gemfile + - gemfile: gemfiles/rack_1.gemfile rvm: 2.7.0 - gemfile: gemfiles/rails_4_2.gemfile rvm: 2.7.0 diff --git a/Appraisals b/Appraisals index 834d201..ef44d14 100644 --- a/Appraisals +++ b/Appraisals @@ -1,16 +1,16 @@ # frozen_string_literal: true -appraise "rack_2_0" do - gem "rack", "~> 2.0.4" +appraise "rack_2" do + gem "rack", "~> 2.0" end -appraise "rack_1_6" do +appraise "rack_1" do # Override activesupport and actionpack version constraints by making # it more loose so it's compatible with rack 1.6.x gem "actionpack", ">= 4.2" gem "activesupport", ">= 4.2" - gem "rack", "~> 1.6.9" + gem "rack", "~> 1.6" # Override rack-test version constraint by making it more loose # so it's compatible with actionpack 4.2.x diff --git a/gemfiles/rack_1_6.gemfile b/gemfiles/rack_1.gemfile similarity index 88% rename from gemfiles/rack_1_6.gemfile rename to gemfiles/rack_1.gemfile index 0cc0050..2390b85 100644 --- a/gemfiles/rack_1_6.gemfile +++ b/gemfiles/rack_1.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "actionpack", ">= 4.2" gem "activesupport", ">= 4.2" -gem "rack", "~> 1.6.9" +gem "rack", "~> 1.6" gem "rack-test", ">= 0.6" gemspec path: "../" diff --git a/gemfiles/rack_2_0.gemfile b/gemfiles/rack_2.gemfile similarity index 80% rename from gemfiles/rack_2_0.gemfile rename to gemfiles/rack_2.gemfile index 9915a10..964e087 100644 --- a/gemfiles/rack_2_0.gemfile +++ b/gemfiles/rack_2.gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -gem "rack", "~> 2.0.4" +gem "rack", "~> 2.0" gemspec path: "../"