Update dependency io.cucumber:gherkin to v24

Author: mpkorstanje

cucumber-bom/pom.xml

@@ -14,7 +14,7 @@
     <properties>
         <ci-environment.version>9.1.0</ci-environment.version>
         <cucumber-expressions.version>16.0.0</cucumber-expressions.version>
-        <html-formatter.version>19.2.0</html-formatter.version>
+        <html-formatter.version>20.0.0</html-formatter.version>
         <tag-expressions.version>4.1.0</tag-expressions.version>
     </properties>
 

cucumber-core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -199,15 +200,15 @@ private String removeArgFor(String arg, List<String> args) {
 
     private byte printI18n(String language) {
         GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
-        List<String> languages = dialectProvider.getLanguages();
+        Set<String> languages = dialectProvider.getLanguages();
 
         if (language.equalsIgnoreCase("help")) {
             if (language.equalsIgnoreCase("help")) {
-                List<GherkinDialect> dialects = new ArrayList<>();
-                for (String code : languages) {
-                    GherkinDialect dialect = dialectProvider.getDialect(code, null);
-                    dialects.add(dialect);
-                }
+                List<GherkinDialect> dialects = languages.stream()
+                        .map(dialectProvider::getDialect)
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .collect(Collectors.toList());
 
                 int widestLanguage = findWidest(dialects, GherkinDialect::getLanguage);
                 int widestName = findWidest(dialects, GherkinDialect::getName);
@@ -220,7 +221,8 @@ private byte printI18n(String language) {
             }
         }
         if (languages.contains(language)) {
-            return printKeywordsFor(dialectProvider.getDialect(language, null));
+            dialectProvider.getDialect(language)
+                    .ifPresent(this::printKeywordsFor);
         }
 
         out.println("Unrecognised ISO language code");

cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java

@@ -56,7 +56,9 @@ public Optional<Feature> parse(URI path, String source, Supplier<UUID> idGenerat
                     cucumberQuery.update(feature);
                     GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
                     String language = feature.getLanguage();
-                    GherkinDialect dialect = dialectProvider.getDialect(language, null);
+                    GherkinDialect dialect = dialectProvider.getDialect(language)
+                            // Can't happen, we just parsed the feature.
+                            .orElseThrow(() -> new IllegalStateException(language + "was not a known gherkin Dialect"));
 
                     List<io.cucumber.messages.types.Pickle> pickleMessages = envelopes.stream()
                             .map(Envelope::getPickle)

cucumber-java/src/main/groovy/generate-annotations.groovy

@@ -16,7 +16,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
 GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
 
 dialectProvider.getLanguages().each { language ->
-    def dialect = dialectProvider.getDialect(language, null)
+    def dialect = dialectProvider.getDialect(language).get()
     def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
     if (!unsupported.contains(normalized_language)) {
         dialect.stepKeywords.findAll { !it.contains('*') && !it.matches("^\\d.*") }.unique().each { kw ->

cucumber-java8/src/main/groovy/generate-interfaces.groovy

@@ -9,7 +9,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
 GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
 
 dialectProvider.getLanguages().each { language ->
-    def dialect = dialectProvider.getDialect(language, null)
+    def dialect = dialectProvider.getDialect(language).get()
     def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
     if (!unsupported.contains(normalized_language)) {
         def templateSource = new File(project.basedir, "src/main/groovy/lambda.java.gsp").getText()

pom.xml

@@ -20,8 +20,8 @@
 
         <!-- io.cucumber dependencies -->
         <!-- Whenever messages is updated run `make update-cck` -->
-        <messages.version>18.0.0</messages.version>
-        <gherkin.version>23.0.1</gherkin.version>
+        <messages.version>19.0.0</messages.version>
+        <gherkin.version>24.0.0</gherkin.version>
 
         <!--Maven plugins-->
         <groovy.version>2.5.15</groovy.version>