From 9e7e8222a8f878d02dbb23aaa28b19a9e9b0d829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aslak=20Helles=C3=B8y?= Date: Wed, 30 May 2018 13:54:12 +0100 Subject: [PATCH 1/3] Upgrade gherkin and cucumber expressions --- cucumber.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cucumber.gemspec b/cucumber.gemspec index f3fd1804de..905c158813 100644 --- a/cucumber.gemspec +++ b/cucumber.gemspec @@ -14,10 +14,10 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.2' s.add_dependency 'builder', '>= 2.1.2' s.add_dependency 'cucumber-core', '~> 3.1.0' - s.add_dependency 'cucumber-expressions', '~> 5.0.14' + s.add_dependency 'cucumber-expressions', '~> 6.0.0' s.add_dependency 'cucumber-wire', '~> 0.0.1' s.add_dependency 'diff-lcs', '~> 1.3' - s.add_dependency 'gherkin', '~> 5.0' + s.add_dependency 'gherkin', '~> 5.1.0' s.add_dependency 'multi_json', '>= 1.7.5', '< 2.0' s.add_dependency 'multi_test', '>= 0.1.2' From 00c684cfe6768ed368c7148d9863c6c8e000c1ea Mon Sep 17 00:00:00 2001 From: Andrew Walter Date: Sun, 3 Jun 2018 19:01:21 +1000 Subject: [PATCH 2/3] CI: Switch JRuby to CircleCI image from Alpine. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8911c3644c..2711463032 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ jobs: "jruby": docker: - - image: jruby:9.1.16.0-jdk-alpine + - image: circleci/jruby:9.1.16.0-jdk working_directory: ~/repo steps: - checkout From 92a29679b4d5ec65393bff6a89f5e2afe4ac3ad6 Mon Sep 17 00:00:00 2001 From: Andrew Walter Date: Sun, 3 Jun 2018 19:11:23 +1000 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5609f18f20..2866a1188d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo ### Changed * Add Rubocop to default Rake task ([#1256](https://github.com/cucumber/cucumber-ruby/pull/1256) [@jaysonesmith](https://github.com/jaysonesmith)) +* Upgraded `cucumber-expressions` dependency to ~> 6.0.0 ([#1299](https://github.com/cucumber/cucumber-ruby/pull/1299) [@aslakhellesoy](https://github.com/aslakhellesoy)) +* Upgraded to `gherkin` 5.1.0 ([#1299](https://github.com/cucumber/cucumber-ruby/pull/1299) [@aslakhellesoy](https://github.com/aslakhellesoy)) ### Deprecated