From b7e5c968da440e80154c6eb19445e6254e658426 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Wed, 25 Sep 2019 13:39:23 +0200 Subject: [PATCH 1/3] Loosen dependency on childprocess --- Gemfile | 2 +- aruba.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 6c7dd7d4f..9ae232dc4 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ group :development, :test do elsif RUBY_VERSION < '2.3.0' gem 'childprocess', '~> 1.0.1' else - gem 'childprocess', '~> 2.0' + gem 'childprocess', ['>= 2.0', '< 4.0'] end if RUBY_VERSION < '1.9.2' diff --git a/aruba.gemspec b/aruba.gemspec index 1f777f286..feb1b84cb 100644 --- a/aruba.gemspec +++ b/aruba.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.homepage = 'http://github.com/cucumber/aruba' s.add_runtime_dependency 'cucumber', '>= 1.3.19' - s.add_runtime_dependency 'childprocess', ['>= 0.6.3', '< 3.0.0'] + s.add_runtime_dependency 'childprocess', ['>= 0.6.3', '< 4.0.0'] s.add_runtime_dependency 'ffi', '~> 1.9' s.add_runtime_dependency 'rspec-expectations', '>= 2.99' s.add_runtime_dependency 'contracts', '~> 0.9' From 40de230a133ed7ffd6ccc815062f7b7efe054227 Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Wed, 25 Sep 2019 15:31:50 +0200 Subject: [PATCH 2/3] Avoid installing minitest 5.12 on Ruby 1.8 --- Gemfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9ae232dc4..e1db5d7e9 100644 --- a/Gemfile +++ b/Gemfile @@ -111,5 +111,9 @@ group :development, :test do gem 'ffi', '< 1.11.0' end - gem 'minitest', '~> 5.8' + if RUBY_VERSION < '1.9.3' + gem 'minitest', '~> 5.8.0' + else + gem 'minitest', '~> 5.8' + end end From f2787a8b142075fdb5773298b888640ead890d2c Mon Sep 17 00:00:00 2001 From: Matijs van Zuijlen Date: Wed, 25 Sep 2019 15:36:38 +0200 Subject: [PATCH 3/3] Remove unused cucumber-pro dependency --- Gemfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index e1db5d7e9..b70c6705f 100644 --- a/Gemfile +++ b/Gemfile @@ -103,10 +103,6 @@ group :development, :test do gem 'rubocop', '~> 0.32', '< 0.41.1' end - if RUBY_VERSION >= '1.9.3' - gem 'cucumber-pro', '~> 0.0' - end - if RUBY_VERSION < '2.0.0' gem 'ffi', '< 1.11.0' end