From 140026691347239e090efb6c0b5cb6ccd382ab84 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Fri, 19 Feb 2016 08:09:55 -0800 Subject: [PATCH] Remove gemfiles from the travis configuration --- .travis.yml | 3 --- Gemfile | 8 +------- dor-services.gemspec | 2 ++ gemfiles/rails4.gemfile | 10 ---------- 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 gemfiles/rails4.gemfile diff --git a/.travis.yml b/.travis.yml index d46bd117..5955568c 100644 --- 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 index cc4f76ed..3931f00f 100644 --- 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 index a13932f4..27fb8486 100644 --- 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 deleted file mode 100644 index 452bb5cb..00000000 --- a/gemfiles/rails4.gemfile +++ /dev/null @@ -1,10 +0,0 @@ -source 'https://rubygems.org' -gemspec :path => '../' - -gem 'activesupport', '~> 4.1' - -group :development, :test do - gem 'vcr' - gem 'webmock' -end -