Merge branch 'main' into fix-doc-semantic-sort-def-val

Author: nedtwigg

plugin-gradle/CHANGES.md

@@ -4,6 +4,16 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 
+### Fixed
+* Correctly support the syntax
+  ```
+  spotless {
+    yaml {
+      jackson().yamlFeature("MINIMIZE_QUOTES", true)
+    }
+  }
+  ```
+
 ## [6.19.0] - 2023-05-24
 ### Added
 * Support Rome as a formatter for JavaScript and TypeScript code. Adds a new `rome` step to `javascript` and `typescript` formatter configurations. ([#1663](https://github.com/diffplug/spotless/pull/1663))

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/AJacksonGradleConfig.java

@@ -21,7 +21,7 @@
 import com.diffplug.spotless.json.JacksonConfig;
 import com.diffplug.spotless.json.JacksonJsonStep;
 
-public abstract class AJacksonGradleConfig {
+public abstract class AJacksonGradleConfig<T extends AJacksonGradleConfig> {
 	protected final FormatExtension formatExtension;
 
 	protected JacksonConfig jacksonConfig;
@@ -35,17 +35,19 @@ public AJacksonGradleConfig(JacksonConfig jacksonConfig, FormatExtension formatE
 		this.jacksonConfig = jacksonConfig;
 	}
 
-	public AJacksonGradleConfig feature(String feature, boolean toggle) {
+	public T feature(String feature, boolean toggle) {
 		this.jacksonConfig.appendFeatureToToggle(Collections.singletonMap(feature, toggle));
 		formatExtension.replaceStep(createStep());
-		return this;
+		return self();
 	}
 
-	public AJacksonGradleConfig version(String version) {
+	public T version(String version) {
 		this.version = version;
 		formatExtension.replaceStep(createStep());
-		return this;
+		return self();
 	}
 
+	public abstract T self();
+
 	protected abstract FormatterStep createStep();
 }

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java

@@ -132,7 +132,7 @@ private FormatterStep createStep() {
 		}
 	}
 
-	public static class JacksonJsonGradleConfig extends AJacksonGradleConfig {
+	public static class JacksonJsonGradleConfig extends AJacksonGradleConfig<JacksonJsonGradleConfig> {
 		protected JacksonJsonConfig jacksonConfig;
 
 		public JacksonJsonGradleConfig(JacksonJsonConfig jacksonConfig, FormatExtension formatExtension) {
@@ -149,12 +149,17 @@ public JacksonJsonGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * Refers to com.fasterxml.jackson.core.JsonGenerator.Feature
 		 */
-		public AJacksonGradleConfig jsonFeature(String feature, boolean toggle) {
+		public JacksonJsonGradleConfig jsonFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendJsonFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
 
+		@Override
+		public JacksonJsonGradleConfig self() {
+			return this;
+		}
+
 		// 'final' as it is called in the constructor
 		@Override
 		protected final FormatterStep createStep() {

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/YamlExtension.java

@@ -39,11 +39,11 @@ protected void setupTask(SpotlessTask task) {
 		super.setupTask(task);
 	}
 
-	public AJacksonGradleConfig jackson() {
+	public JacksonYamlGradleConfig jackson() {
 		return new JacksonYamlGradleConfig(this);
 	}
 
-	public class JacksonYamlGradleConfig extends AJacksonGradleConfig {
+	public class JacksonYamlGradleConfig extends AJacksonGradleConfig<JacksonYamlGradleConfig> {
 		protected JacksonYamlConfig jacksonConfig;
 
 		public JacksonYamlGradleConfig(JacksonYamlConfig jacksonConfig, FormatExtension formatExtension) {
@@ -61,12 +61,17 @@ public JacksonYamlGradleConfig(FormatExtension formatExtension) {
 		/**
 		 * Refers to com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature
 		 */
-		public AJacksonGradleConfig yamlFeature(String feature, boolean toggle) {
+		public JacksonYamlGradleConfig yamlFeature(String feature, boolean toggle) {
 			this.jacksonConfig.appendYamlFeatureToToggle(Collections.singletonMap(feature, toggle));
 			formatExtension.replaceStep(createStep());
 			return this;
 		}
 
+		@Override
+		public JacksonYamlGradleConfig self() {
+			return this;
+		}
+
 		// 'final' as it is called in the constructor
 		@Override
 		protected final FormatterStep createStep() {

plugin-maven/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Added
+* Support pass skip (`-Dspotless.skip=true`) from command-line. ([#1729](https://github.com/diffplug/spotless/pull/1729))
 ### Fixed
 * Update documented default `semanticSort` to `false`. ([#1728](https://github.com/diffplug/spotless/pull/1728))
 

plugin-maven/build.gradle

@@ -3,7 +3,7 @@ import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescri
 
 plugins {
 	// https://www.benediktritter.de/maven-plugin-development/#release-history
-	id 'de.benediktritter.maven-plugin-development' version '0.4.1'
+	id 'de.benediktritter.maven-plugin-development' version '0.4.2'
 }
 
 apply from: rootProject.file('gradle/changelog.gradle')

plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java

@@ -100,7 +100,7 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${mojoExecution.goal}", required = true, readonly = true)
 	private String goal;
 
-	@Parameter(defaultValue = "false")
+	@Parameter(property = "spotless.skip", defaultValue = "false")
 	private boolean skip;
 
 	@Parameter(property = "spotless.apply.skip", defaultValue = "false")