Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #580

Merged
merged 7 commits into from
Jan 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
sudo: false
language: ruby
script: bundle exec rake test
before_install:
- gem install bundler -v '< 2'
bundler_args: --without development debug

jobs:
Expand All @@ -14,17 +16,17 @@ jobs:
os: linux
- rvm: 2.6.0
os: osx
- rvm: 2.5.0
- rvm: 2.5.3
os: linux
- rvm: 2.5.0
- rvm: 2.5.3
os: osx
- rvm: 2.4.3
- rvm: 2.4.5
os: linux
- rvm: 2.4.3
- rvm: 2.4.4
os: osx
- rvm: 2.3.6
- rvm: 2.3.8
os: linux
- rvm: 2.3.6
- rvm: 2.3.8
os: osx
- rvm: 2.2
os: linux
Expand All @@ -46,18 +48,18 @@ jobs:
osx_image: xcode8
- rvm: jruby
os: linux
- rvm: jruby-9.1.16.0
- rvm: jruby-9.2.5.0
os: linux
- rvm: jruby-9.1.16.0
- rvm: jruby-9.2.5.0
os: osx
- stage: lint
script: bundle exec rake lint
rvm: 2.5.0
rvm: 2.6.0
os: linux
allow_failures:
- rvm: ruby-head
- rvm: jruby
- rvm: jruby-9.1.16.0
- rvm: jruby-9.2.5.0
fast_finish: true

branches:
Expand Down
16 changes: 5 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ group :debug do
if RUBY_VERSION < '2'
gem 'pry-doc', '~> 0.8.0'
else
gem 'pry-doc', '~> 0.13.1'
gem 'pry-doc', '~> 1.0.0'
end
end

# Tools to run during development
group :development do
# Needed for lint:yard:junk task
if RUBY_VERSION >= '2.3.0'
Expand All @@ -38,7 +39,7 @@ end
group :development, :test do
# we use this to demonstrate interactive debugging within our feature tests
if RUBY_VERSION >= '2'
gem 'pry', '~> 0.11.2'
gem 'pry', '~> 0.12.2'
else
gem 'pry', '~> 0.9.12'
end
Expand Down Expand Up @@ -76,15 +77,8 @@ group :development, :test do
# gem 'cucumber-pro', '~> 0.0'

# License compliance
if RUBY_VERSION < '2.3'
gem 'license_finder', '~> 2.0'
else
gem 'license_finder', '~> 5.0.3'
end

# Force compatible version of httparty for use by license_finder
if RUBY_VERSION <= '2.0.0'
gem 'httparty', '0.14.0'
if RUBY_VERSION >= '2.3'
gem 'license_finder', '~> 5.0'
end

# Upload documentation
Expand Down
6 changes: 5 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ namespace :lint do

desc 'Check for relevant licenses in project'
task :licenses do
sh 'bundle exec license_finder'
if RUBY_VERSION >= '2.3'
sh 'bundle exec license_finder'
else
warn 'Your ruby version is not supported for license checking'
end
end

begin
Expand Down
2 changes: 1 addition & 1 deletion aruba.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'contracts', '~> 0.13'
spec.add_runtime_dependency 'thor', '~> 0.19'

spec.add_development_dependency 'bundler', '~> 1.7'
spec.add_development_dependency 'bundler', ['>= 1.7.0', '< 3.0']
spec.rubygems_version = ">= 1.6.1"
spec.required_ruby_version = '>= 1.9.3'

Expand Down