From b29d8606e7bba4b4e22310475d667f8120646013 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 8 Aug 2016 11:01:10 -0700
Subject: [PATCH] Remove separate gemfiles for rack 1 and rack 2

---
 .travis.yml         |  7 -------
 Gemfile             |  1 +
 Gemfile.rack-1.3.x  | 20 --------------------
 Gemfile.rack-master | 16 ----------------
 4 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 Gemfile.rack-1.3.x
 delete mode 100644 Gemfile.rack-master

diff --git a/.travis.yml b/.travis.yml
index dafcc61..c2f6409 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ cache: bundler
 env:
   global:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
-gemfile:
-  - Gemfile
-  - Gemfile.rack-1.3.x
 language: ruby
 rvm:
   - jruby-18mode
@@ -21,13 +18,9 @@ rvm:
   - rbx-2
   - ruby-head
 matrix:
-  include:
-    - rvm: 2.2.2
-      gemfile: Gemfile.rack-master
   allow_failures:
     - rvm: jruby-head
     - rvm: rbx-2
     - rvm: ruby-head
-    - gemfile: Gemfile.rack-master
   fast_finish: true
 sudo: false
diff --git a/Gemfile b/Gemfile
index 1097cc1..37f45d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ group :test do
   gem 'json', '>= 1.8.1', :platforms => [:jruby_18, :jruby_19, :ruby_18, :ruby_19]
   gem 'mime-types', '~> 1.25', :platforms => [:jruby_18, :ruby_18]
   gem 'rack-test'
+  gem 'rack', '~> 1.0', :platforms => [:jruby_18, :jruby_19, :ruby_18, :ruby_19, :ruby_20, :ruby_21]
   gem 'rest-client', '~> 1.6.0', :platforms => [:jruby_18, :ruby_18]
   gem 'rspec', '~> 3.0'
   gem 'rubocop', '>= 0.25', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
diff --git a/Gemfile.rack-1.3.x b/Gemfile.rack-1.3.x
deleted file mode 100644
index 7423546..0000000
--- a/Gemfile.rack-1.3.x
+++ /dev/null
@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'jruby-openssl', :platforms => :jruby
-gem 'rack', '~> 1.3.0'
-gem 'rake'
-gem 'yard'
-
-group :test do
-  gem 'coveralls'
-  gem 'hashie', '~> 2.0.5', :platforms => [:jruby_18, :ruby_18]
-  gem 'json', '>= 1.8.1', :platforms => [:jruby_18, :jruby_18, :ruby_18, :ruby_19]
-  gem 'mime-types', '~> 1.25', :platforms => [:jruby_18, :ruby_18]
-  gem 'rack-test'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby_18, :ruby_18]
-  gem 'rspec', '~> 3.0'
-  gem 'rubocop', '>= 0.25', :platforms => [:ruby_19, :ruby_20, :ruby_21]
-  gem 'simplecov', '>= 0.9'
-end
-
-gemspec
diff --git a/Gemfile.rack-master b/Gemfile.rack-master
deleted file mode 100644
index b42c675..0000000
--- a/Gemfile.rack-master
+++ /dev/null
@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'jruby-openssl', :platforms => :jruby
-gem 'rack', :git => 'https://github.com/rack/rack.git'
-gem 'rake'
-gem 'yard'
-
-group :test do
-  gem 'coveralls'
-  gem 'rack-test'
-  gem 'rspec', '~> 3.0'
-  gem 'rubocop', '>= 0.25'
-  gem 'simplecov', '>= 0.9'
-end
-
-gemspec