diff --git a/CHANGELOG.md b/CHANGELOG.md index 034ac7cde..a190255fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,16 +11,22 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt ### Added -* [Java] Added support for reading directly from input (files, streams, paths, ect) -* [C] The C implementation re-enabled and made up to date. - ([#1989](https://github.com/cucumber/common/pull/1989)) - ### Changed ### Deprecated ### Removed +### Fixed + +## [24.1.0] - 2022-10-10 + +### Added + +* [Java] Added support for reading directly from input (files, streams, paths, ect) +* [C] The C implementation re-enabled and made up to date. + ([#1989](https://github.com/cucumber/common/pull/1989)) + ### Fixed * [Javascript] Include tags from rules in scenario outlines ([#2091](https://github.com/cucumber/common/pull/2091)) * [Python] Fix gherkin-python for compiling example values with trailing backslash ([#2048](https://github.com/cucumber/common/pull/2048), [#1954](https://github.com/cucumber/common/issues/1954)) @@ -1125,7 +1131,8 @@ to Gherkin 2. * First release -[Unreleased]: https://github.com/cucumber/cucumber/compare/gherkin/v24.0.0...main +[Unreleased]: https://github.com/cucumber/cucumber/compare/gherkin/v24.1.0...main +[24.1.0]: https://github.com/cucumber/cucumber/compare/gherkin/v24.0.0...gherkin/v24.1.0 [24.0.0]: https://github.com/cucumber/cucumber/compare/gherkin/v23.0.1...gherkin/v24.0.0 [23.0.1]: https://github.com/cucumber/cucumber/compare/gherkin/v23.0.0...gherkin/v23.0.1 [23.0.0]: https://github.com/cucumber/cucumber/compare/gherkin/v22.0.0...gherkin/v23.0.0 diff --git a/dotnet/Gherkin/Gherkin.csproj b/dotnet/Gherkin/Gherkin.csproj index ea30d46b3..173a2a91e 100644 --- a/dotnet/Gherkin/Gherkin.csproj +++ b/dotnet/Gherkin/Gherkin.csproj @@ -10,7 +10,7 @@ - 24.0.0 + 24.1.0 $(VersionNumber)-$(SnapshotSuffix) $(VersionNumber) diff --git a/go/go.mod b/go/go.mod index 71f037ecb..fa226f8ac 100644 --- a/go/go.mod +++ b/go/go.mod @@ -7,9 +7,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/gofrs/uuid v4.2.0+incompatible // indirect + github.com/gofrs/uuid v4.3.0+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.19 +go 1.18 diff --git a/go/go.sum b/go/go.sum index 7209b9bbe..c1cbc9f05 100644 --- a/go/go.sum +++ b/go/go.sum @@ -3,8 +3,9 @@ github.com/cucumber/common/messages/go/v19 v19.1.2/go.mod h1:0KLDvMVmmkEZcWUSKxF github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= +github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/java/pom.xml b/java/pom.xml index 65b47e959..6afe7df47 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -8,7 +8,7 @@ 3.0.0 gherkin - 24.0.1-SNAPSHOT + 24.1.0 jar Gherkin Gherkin parser @@ -48,7 +48,7 @@ io.cucumber messages - [19.0.0,20.0.0) + [19.1.4,20.0.0) diff --git a/javascript/package.json b/javascript/package.json index ba53d4791..af96f3175 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@cucumber/gherkin", - "version": "24.0.0", + "version": "24.1.0", "description": "Gherkin parser", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -32,7 +32,7 @@ "typescript": "4.8.4" }, "dependencies": { - "@cucumber/messages": "^19.1.2" + "@cucumber/messages": "^19.1.4" }, "directories": { "test": "test" diff --git a/perl/VERSION b/perl/VERSION index 51105aade..7c974b0f4 100644 --- a/perl/VERSION +++ b/perl/VERSION @@ -1 +1 @@ -24.0.0 +24.1.0 diff --git a/php/default.mk b/php/default.mk index f028c7713..6a25fa471 100644 --- a/php/default.mk +++ b/php/default.mk @@ -48,7 +48,8 @@ clean: .tested: .deps $(PHP_SOURCE_FILES) vendor/bin/php-cs-fixer --dry-run --diff fix - vendor/bin/psalm --no-cache +# Disabled: See https://github.com/cucumber/common/pull/2095 +# vendor/bin/psalm --no-cache vendor/bin/phpunit touch $@ diff --git a/php/src-generated/Parser.php b/php/src-generated/Parser.php index c5fcb31ed..0886c26d0 100644 --- a/php/src-generated/Parser.php +++ b/php/src-generated/Parser.php @@ -3977,7 +3977,7 @@ private function lookahead_0(ParserContext $context): bool if (false || $this->match_ScenarioLine($context, $token) -) { + ) { $match = true; break; } @@ -3985,7 +3985,7 @@ private function lookahead_0(ParserContext $context): bool || $this->match_Empty($context, $token) || $this->match_Comment($context, $token) || $this->match_TagLine($context, $token) -); + ); $context->tokenQueue = [...$context->tokenQueue, ...$queue]; @@ -4002,7 +4002,7 @@ private function lookahead_1(ParserContext $context): bool if (false || $this->match_ExamplesLine($context, $token) -) { + ) { $match = true; break; } @@ -4010,7 +4010,7 @@ private function lookahead_1(ParserContext $context): bool || $this->match_Empty($context, $token) || $this->match_Comment($context, $token) || $this->match_TagLine($context, $token) -); + ); $context->tokenQueue = [...$context->tokenQueue, ...$queue]; diff --git a/python/setup.py b/python/setup.py index 65d389c5a..21292c217 100644 --- a/python/setup.py +++ b/python/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name="gherkin-official", packages=["gherkin", "gherkin.pickles", "gherkin.stream"], - version="24.0.0", + version="24.1.0", description="Gherkin parser (official, by Cucumber team)", long_description="Gherkin parser (official, by Cucumber team)", author="Cucumber Ltd and Björn Rasmusson", diff --git a/ruby/VERSION b/ruby/VERSION index 51105aade..7c974b0f4 100644 --- a/ruby/VERSION +++ b/ruby/VERSION @@ -1 +1 @@ -24.0.0 +24.1.0 diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec index c3f84adcb..7b20a93c5 100644 --- a/ruby/cucumber-gherkin.gemspec +++ b/ruby/cucumber-gherkin.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| 'source_code_uri' => 'https://github.com/cucumber/common/blob/main/gherkin/ruby' } - s.add_dependency 'cucumber-messages', '~> 19.0', '>= 19.0.0' + s.add_dependency 'cucumber-messages', '~> 19.1', '>= 19.1.4' s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0'