Skip to content

Commit

Permalink
Fix failing CI configuration, add new ruby versions to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jastkand committed Apr 14, 2017
1 parent 6449b5d commit 8c78e6f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
language: ruby
rvm:
- 2.0.0
- 2.0
- 2.1
- 2.2
- 2.3
- 2.4.0
- ruby-head
- jruby-19mode # JRuby in 1.9 mode
- rbx-2
matrix:
allow_failures:
- rvm: ruby-head
- rvm: rbx-2
bundler_args: --without local_development
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ source 'https://rubygems.org'
gemspec

if ENV['TRAVIS']
gem 'roo', '>= 2.0.0beta1', github: 'roo-rb/roo'
gem 'roo', '>= 2.0.0beta1', git: 'https://github.com/roo-rb/roo.git'
else
gem 'roo', '>= 2.0.0beta1', path: ::File.expand_path('../../roo', __FILE__)
end

gem 'activesupport', '~> 4.2.0' if RUBY_VERSION < '2.2'

group :test do
# additional testing libs
gem 'webmock'
Expand Down
7 changes: 6 additions & 1 deletion roo-xls.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.add_dependency "roo", ">= 2.0.0beta1", "< 3"
spec.add_dependency "nokogiri"
spec.add_dependency "spreadsheet", "> 0.9.0"

if RUBY_VERSION >= '2.1'
spec.add_dependency "nokogiri"
else
spec.add_dependency "nokogiri", "~> 1.6.0"
end

spec.add_development_dependency "bundler", ">= 1.7"
spec.add_development_dependency "rake", ">= 10.0"
end

0 comments on commit 8c78e6f

Please sign in to comment.