Merge branch 'main' into main

cucumber · Aug 15, 2024 · 99392ac · 99392ac
2 parents 73a03b6 + 87213be
commit 99392ac
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,19 @@ This project adheres to [Semantic Versioning](http://semver.org).
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
 ## [Unreleased]
+### Changed
+- [Ruby] Upgraded messages support to permit up to v26
+- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0
+
+## [29.0.0] - 2024-08-12
 ### Added
 - (i18n) Added Gujarati translation for "Rule" ([#249](https://github.com/cucumber/gherkin/pull/249))
 - [Ruby] Skeleton to begin technical refactor of internals ([#259](https://github.com/cucumber/gherkin/pull/259))
 
+### Changed
+- [Java, JavaScript, PHP, Go, Ruby] Upgraded messages to v25
+- [Ruby] Update minimum ruby requirement from 2.5 to 3.0 ([#259](https://github.com/cucumber/gherkin/pull/259))
+
 ### Fixed
 - [.NET] Provide informative exception for trailing escapes in tables ([#245](https://github.com/cucumber/gherkin/pull/245))
 - [Perl] Provide informative exception for trailing escapes in tables ([#245](https://github.com/cucumber/gherkin/pull/245))
@@ -19,12 +28,12 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 - (i18n) Provide trailing space in Irish step keywords ([#243](https://github.com/cucumber/gherkin/pull/243))
 - (i18n) Provide trailing space in Korean step keywords ([#254](https://github.com/cucumber/gherkin/pull/254))
 - (i18n) Tamil "And" and "But" translations should have single trailing space ([#243](https://github.com/cucumber/gherkin/pull/243))
+- (i18n) Remove duplicate scenario keyword from "sr-Cyrl" ([#264](https://github.com/cucumber/gherkin/pull/264))
 - Intermittent failure of cpp test jobs in CI ([#217](https://github.com/cucumber/gherkin/issues/217))
 
 ### Changed
 - [Java, JavaScript, PHP, Go, Ruby] Upgraded messages to v25
 - [Ruby] Update minimum ruby requirement from 2.5 to 3.0 ([#259](https://github.com/cucumber/gherkin/pull/259))
-- [.NET] Drop unsupported frameworks. Now supported target frameworks are .NET 8, .NET Framework 4.6.2, .NET Standard 2.0
 
 ## [28.0.0] - 2024-02-15
 ### Added
@@ -666,7 +675,8 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 ### Changed
 - First release
 
-[Unreleased]: https://github.com/cucumber/gherkin/compare/v28.0.0...HEAD
+[Unreleased]: https://github.com/cucumber/gherkin/compare/v29.0.0...HEAD
+[29.0.0]: https://github.com/cucumber/gherkin/compare/v28.0.0...v29.0.0
 [28.0.0]: https://github.com/cucumber/gherkin/compare/v27.0.0...v28.0.0
 [27.0.0]: https://github.com/cucumber/gherkin/compare/v26.2.0...v27.0.0
 [26.2.0]: https://github.com/cucumber/gherkin/compare/v26.1.0...v26.2.0

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -142,7 +142,7 @@ pass!
 Then send us a pull-request :-)
 
 And if you're stuck - please shoot message to the #commiters channel in the 
-[CucumberBDD Slack](https://cucumberbdd-slack-invite.herokuapp.com/) <sup>[direct link](https://cucumberbdd.slack.com/)</sup>.
+[Cucumber Discord](https://cucumber.io/docs/community/get-in-touch/#discord).
 
 ## Make a release
 

diff --git a/c/VERSION b/c/VERSION
@@ -1 +1 @@
-28.0.0
+29.0.0
diff --git a/c/src/dialect.c b/c/src/dialect.c
@@ -2935,8 +2935,8 @@ static const Keywords sr_Cyrl_given_keywords = { 4, sr_Cyrl_given_KEYWORDS };
 static const wchar_t* const sr_Cyrl_rule_KEYWORDS[] = { L"Правило" };
 static const Keywords sr_Cyrl_rule_keywords = { 1, sr_Cyrl_rule_KEYWORDS };
 
-static const wchar_t* const sr_Cyrl_scenario_KEYWORDS[] = { L"Пример", L"Сценарио", L"Пример" };
-static const Keywords sr_Cyrl_scenario_keywords = { 3, sr_Cyrl_scenario_KEYWORDS };
+static const wchar_t* const sr_Cyrl_scenario_KEYWORDS[] = { L"Сценарио", L"Пример" };
+static const Keywords sr_Cyrl_scenario_keywords = { 2, sr_Cyrl_scenario_KEYWORDS };
 
 static const wchar_t* const sr_Cyrl_scenarioOutline_KEYWORDS[] = { L"Структура сценарија", L"Скица", L"Концепт" };
 static const Keywords sr_Cyrl_scenarioOutline_keywords = { 3, sr_Cyrl_scenarioOutline_KEYWORDS };

diff --git a/dart/assets/gherkin-languages.json b/dart/assets/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/dotnet/Gherkin/Gherkin.csproj b/dotnet/Gherkin/Gherkin.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Version">
-    <VersionNumber>28.0.0</VersionNumber>
+    <VersionNumber>29.0.0</VersionNumber>
     <Version Condition="'$(SnapshotSuffix)' != ''">$(VersionNumber)-$(SnapshotSuffix)</Version>
     <Version Condition="'$(SnapshotSuffix)' == ''">$(VersionNumber)</Version>
   </PropertyGroup>

diff --git a/dotnet/Gherkin/gherkin-languages.json b/dotnet/Gherkin/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/elixir/mix.exs b/elixir/mix.exs
@@ -6,7 +6,7 @@ defmodule CucumberGherkin.MixProject do
   def project do
     [
       app: :cucumber_gherkin,
-      version: "28.0.0",
+      version: "29.0.0",
       name: "CucumberGherkin",
       description: description(),
       package: package(),

diff --git a/elixir/priv/gherkin_languages.json b/elixir/priv/gherkin_languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/gherkin-languages.json b/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/go/dialects_builtin.go b/go/dialects_builtin.go
diff --git a/go/gherkin-generate-tokens/gherkin-generate-tokens.go b/go/gherkin-generate-tokens/gherkin-generate-tokens.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	gherkin "github.com/cucumber/gherkin/go/v28"
+	gherkin "github.com/cucumber/gherkin/go/v29"
 	"io"
 	"os"
 	"strings"

diff --git a/go/go.mod b/go/go.mod
@@ -1,4 +1,4 @@
-module github.com/cucumber/gherkin/go/v28
+module github.com/cucumber/gherkin/go/v29
 
 require (
 	github.com/cucumber/messages/go/v24 v24.1.0

diff --git a/go/main/main.go b/go/main/main.go
@@ -9,7 +9,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	gherkin "github.com/cucumber/gherkin/go/v28"
+	gherkin "github.com/cucumber/gherkin/go/v29"
 	"github.com/cucumber/messages/go/v24"
 	"os"
 )

diff --git a/java/pom.xml b/java/pom.xml
@@ -8,14 +8,14 @@
         <version>4.2.0</version>
     </parent>
     <artifactId>gherkin</artifactId>
-    <version>28.0.1-SNAPSHOT</version>
+    <version>29.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Gherkin</name>
     <description>Gherkin parser</description>
     <url>https://github.com/cucumber/gherkin</url>
 
     <properties>
-        <project.build.outputTimestamp>1708027237</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1723455193</project.build.outputTimestamp>
         <project.Automatic-Module-Name>io.cucumber.gherkin</project.Automatic-Module-Name>
     </properties>
 
@@ -38,7 +38,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.3</version>
+                <version>5.11.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cucumber/gherkin",
-  "version": "28.0.0",
+  "version": "29.0.0",
   "description": "Gherkin parser",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -32,10 +32,10 @@
   "homepage": "https://github.com/cucumber/gherkin",
   "devDependencies": {
     "@types/mocha": "10.0.7",
-    "@types/node": "20.14.14",
+    "@types/node": "20.14.15",
     "commander": "^12.0.0",
     "core-js": "3.38.0",
-    "mocha": "10.7.0",
+    "mocha": "10.7.3",
     "ts-node": "10.9.2",
     "typescript": "5.5.4"
   },

diff --git a/javascript/src/gherkin-languages.json b/javascript/src/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/perl/VERSION b/perl/VERSION
@@ -1 +1 @@
-28.0.0
+29.0.0
diff --git a/php/resources/gherkin-languages.json b/php/resources/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/python/gherkin/gherkin-languages.json b/python/gherkin/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],

diff --git a/python/setup.py b/python/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 setup(name="gherkin-official",
       packages=["gherkin", "gherkin.pickles", "gherkin.stream"],
-      version="28.0.0",
+      version="29.0.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
@@ -1 +1 @@
-28.0.0
+29.0.0
diff --git a/ruby/cucumber-gherkin.gemspec b/ruby/cucumber-gherkin.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     'source_code_uri' => 'https://github.com/cucumber/gherkin/blob/main/ruby'
   }
 
-  s.add_runtime_dependency 'cucumber-messages', '> 25', '< 26'
+  s.add_runtime_dependency 'cucumber-messages', '> 25', '< 28'
 
   s.add_development_dependency 'rake', '~> 13.1'
   s.add_development_dependency 'rspec', '~> 3.13'

diff --git a/ruby/lib/gherkin/gherkin-languages.json b/ruby/lib/gherkin/gherkin-languages.json
@@ -3015,7 +3015,6 @@
       "Правило"
     ],
     "scenario": [
-      "Пример",
       "Сценарио",
       "Пример"
     ],