Merge pull request #173 from sul-dlss/no-gemfiles

Remove gemfiles from the travis configuration
sul-dlss-deprecated · Feb 20, 2016 · 185ac2e · 185ac2e
2 parents acb1fb0 + 1400266
commit 185ac2e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,3 @@ notifications:
 rvm:
   - 2.1.2
   - 2.2.2
-
-gemfile:
-  - gemfiles/rails4.gemfile
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'pry-byebug', :platform => [:ruby_20, :ruby_21, :ruby_22]
-  gem 'pry-debugger', '0.2.2', :platform => :ruby_19
-end
-
-group :test do
-  gem 'vcr'
-  gem 'webmock'
+  gem 'pry-byebug'
 end
 
 # Dependencies are defined in dor-services.gemspec

diff --git a/dor-services.gemspec b/dor-services.gemspec
@@ -59,6 +59,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rspec', '~> 3.1'
   s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
   s.add_development_dependency 'yard'
 
   s.files        = Dir.glob('lib/**/*') + Dir.glob('config/**/*') + Dir.glob('bin/*')

diff --git a/gemfiles/rails4.gemfile b/gemfiles/rails4.gemfile