Merge branch 'main' into renovate/com.facebook-ktfmt-0.x

Author: nedtwigg

CHANGES.md

@@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

lib/build.gradle

@@ -90,7 +90,7 @@ dependencies {
 	// flexmark
 	flexmarkCompileOnly 'com.vladsch.flexmark:flexmark-all:0.64.0'
 	// gherkin
-	gherkinCompileOnly 'io.cucumber:gherkin-utils:8.0.2'
+	gherkinCompileOnly 'io.cucumber:gherkin-utils:9.0.0'
 	gherkinCompileOnly 'org.slf4j:slf4j-api:2.0.0'
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.19.2'

lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java

@@ -28,7 +28,7 @@
 public class GherkinUtilsStep implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
-	private static final String DEFAULT_VERSION = "8.0.2";
+	private static final String DEFAULT_VERSION = "9.0.0";
 	public static final String NAME = "gherkinUtils";
 
 	private final JarState.Promised jarState;

plugin-gradle/CHANGES.md

@@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

plugin-gradle/README.md

@@ -1097,7 +1097,7 @@ spotless {
   gherkin {
     target 'src/**/*.feature'     // required to be set explicitly
     gherkinUtils()
-      .version('8.0.2')           // optional: custom version of 'io.cucumber:gherkin-utils'
+      .version('9.0.0')           // optional: custom version of 'io.cucumber:gherkin-utils'
   }
 }
 ```

plugin-maven/CHANGES.md

@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096))
 * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854))
 ### Changes
+* Bump default `gherkin-utils` version to latest `8.0.2` -> `9.0.0`. ([#1703](https://github.com/diffplug/spotless/pull/1703))
 * Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685))
 * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045))
 * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057))

plugin-maven/README.md

@@ -1082,7 +1082,7 @@ Uses a Gherkin pretty-printer that optionally allows configuring the number of s
 
 ```xml
 <gherkinUtils>
-  <version>8.0.2</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
+  <version>9.0.0</version>                 <!-- optional: Custom version of 'io.cucumber:gherkin-utils' -->
 </gherkinUtils>
 ```
 

settings.gradle

@@ -10,7 +10,7 @@ plugins {
 	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 	id 'com.gradle.plugin-publish' version '1.2.1' apply false
 	// https://github.com/gradle-nexus/publish-plugin/releases
-	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
+	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
 	// https://github.com/spotbugs/spotbugs-gradle-plugin/releases
 	id 'com.github.spotbugs' version '6.0.15' apply false
 	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md

testlib/src/main/resources/gherkin/complex_backgroundAfter.feature

@@ -12,7 +12,7 @@ Feature: Complex background
 
   Rule: My Rule
 
-    Background: 
+    Background:
       Given a rule background step
 
     Scenario: with examples

testlib/src/main/resources/gherkin/descriptionsAfter.feature

@@ -29,7 +29,7 @@ This is a description without indentation
   This description
   has a comment after
 
-    # this is a comment
+  # this is a comment
     Given the minimalism
 
   Scenario: comment right after description