Skip to content

Commit

Permalink
Merge pull request #21 from leifg/reconcile-deps
Browse files Browse the repository at this point in the history
Reconcile dependencies
  • Loading branch information
leifg authored Mar 31, 2017
2 parents 59f51df + 704b51a commit 176896f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: false
language: ruby
cache: bundler
bundler_args: --without development
rvm:
- 2.0.0
- 2.1.8
- 2.2.4
- 2.3.0
- 2.4.0
- jruby-9.0.5.0
- ruby-head
- jruby-head
Expand Down
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ source "https://rubygems.org"
gemspec

group :test, :development do
gem "rspec", ">= 2.14", "< 4.0"
gem "coveralls", require: false
gem "simplecov"
gem "rubinius-coverage", platform: :rbx
end

group :development do
gem "guard"
gem "guard-rspec"
gem "simplecov"
gem "pry"
gem "rubinius-coverage", platform: :rbx

gem "rb-inotify", require: false
gem "rb-fsevent", require: false
gem "rb-fchange", require: false
end

gem "json"
10 changes: 5 additions & 5 deletions morfo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features|benchmarks)/})
spec.require_paths = ["lib"]
spec.required_ruby_version = '>= 2.0.0'

spec.add_dependency "rake"
spec.add_dependency "json"
spec.add_dependency "activesupport", "< 5.1"
spec.add_dependency "rubysl" if RUBY_ENGINE == "rbx"
spec.add_runtime_dependency "json"
spec.add_runtime_dependency "activesupport", "< 5.0"
spec.add_runtime_dependency "rubysl" if RUBY_ENGINE == "rbx"

spec.add_development_dependency "rake"
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rspec", ">= 2.14", "< 4.0"
end

0 comments on commit 176896f

Please sign in to comment.