Merge branch 'main' into fix-space-before-separator-jackson

nedtwigg · web-flow · commit fa766ddd6b13 · 2024-07-03T17:52:44.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
diff --git a/gradle/special-tests.gradle b/gradle/special-tests.gradle
@@ -17,13 +17,10 @@ tasks.withType(Test).configureEach {
 			maxRetries = 2
 			maxFailures = 10
 		}
-
-		// There are only 2 cores in each GitHub Action Runner, we use all of them here.
-		maxParallelForks = Runtime.getRuntime().availableProcessors()
-	} else {
-		// https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel
-		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 	}
+
+	// https://docs.gradle.org/8.8/userguide/performance.html#execute_tests_in_parallel
+	maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
 }
 tasks.named('test').configure {
 	useJUnitPlatform {
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -95,7 +95,7 @@ dependencies {
 	// googleJavaFormat
 	googleJavaFormatCompileOnly 'com.google.googlejavaformat:google-java-format:1.22.0'
 	// gson
-	gsonCompileOnly 'com.google.code.gson:gson:2.10.1'
+	gsonCompileOnly 'com.google.code.gson:gson:2.11.0'
 	// jackson
 	String VER_JACKSON='2.17.1'
 	jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON"
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -30,6 +30,7 @@ public class GsonStep implements Serializable {
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
 	public static final String NAME = "gson";
+	public static final String DEFAULT_VERSION = "2.11.0";
 
 	private final JarState.Promised jarState;
 	private final GsonConfig gsonConfig;
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java
@@ -45,6 +45,8 @@ public class SortPomCfg implements Serializable {
 
 	public String predefinedSortOrder = "recommended_2008_06";
 
+	public boolean quiet = false;
+
 	public String sortOrderFile = null;
 
 	public String sortDependencies = null;
diff --git a/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java b/lib/src/sortPom/java/com/diffplug/spotless/glue/pom/SortPomFormatterFunc.java
@@ -85,20 +85,28 @@ public String apply(String input) throws Exception {
 				.setSortEntities(cfg.sortDependencies, cfg.sortDependencyExclusions, cfg.sortDependencyManagement,
 						cfg.sortPlugins, cfg.sortProperties, cfg.sortModules, cfg.sortExecutions)
 				.setIgnoreLineSeparators(false);
-		sortPom.setup(new MySortPomLogger(), builder.build());
+		sortPom.setup(new MySortPomLogger(cfg.quiet), builder.build());
 		sortPom.sortPom();
 		return Files.readString(pom.toPath(), Charset.forName(cfg.encoding));
 	}
 
 	private static class MySortPomLogger implements SortPomLogger {
+		private final boolean quiet;
+
+		public MySortPomLogger(boolean quiet) {
+			this.quiet = quiet;
+		}
+
 		@Override
 		public void warn(String content) {
 			logger.warn(content);
 		}
 
 		@Override
 		public void info(String content) {
-			logger.info(content);
+			if (!quiet) {
+				logger.info(content);
+			}
 		}
 
 		@Override
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
@@ -31,7 +31,6 @@
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
-	private static final String DEFAULT_GSON_VERSION = "2.10.1";
 	private static final String DEFAULT_ZJSONPATCH_VERSION = "0.4.14";
 	static final String NAME = "json";
 
@@ -112,7 +111,7 @@ public GsonConfig() {
 			this.indentSpaces = DEFAULT_INDENTATION;
 			this.sortByKeys = false;
 			this.escapeHtml = false;
-			this.version = DEFAULT_GSON_VERSION;
+			this.version = GsonStep.DEFAULT_VERSION;
 			addStep(createStep());
 		}
 
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/PomExtension.java
@@ -117,6 +117,11 @@ public SortPomGradleConfig predefinedSortOrder(String predefinedSortOrder) {
 			return this;
 		}
 
+		public SortPomGradleConfig quiet(boolean quiet) {
+			cfg.quiet = quiet;
+			return this;
+		}
+
 		public SortPomGradleConfig sortOrderFile(String sortOrderFile) {
 			cfg.sortOrderFile = sortOrderFile;
 			return this;
diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/json/Gson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
 public class Gson implements FormatterStepFactory {
-	private static final String DEFAULT_GSON_VERSION = "2.10.1";
-
 	@Parameter
 	int indentSpaces = Json.DEFAULT_INDENTATION;
 
@@ -36,7 +34,7 @@ public class Gson implements FormatterStepFactory {
 	boolean escapeHtml = false;
 
 	@Parameter
-	String version = DEFAULT_GSON_VERSION;
+	String version = GsonStep.DEFAULT_VERSION;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java
@@ -62,6 +62,9 @@ public class SortPom implements FormatterStepFactory {
 	@Parameter
 	String predefinedSortOrder = defaultValues.predefinedSortOrder;
 
+	@Parameter
+	boolean quiet = defaultValues.quiet;
+
 	@Parameter
 	String sortOrderFile = defaultValues.sortOrderFile;
 
@@ -101,6 +104,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		cfg.indentSchemaLocation = indentSchemaLocation;
 		cfg.indentAttribute = indentAttribute;
 		cfg.predefinedSortOrder = predefinedSortOrder;
+		cfg.quiet = quiet;
 		cfg.sortOrderFile = sortOrderFile;
 		cfg.sortDependencies = sortDependencies;
 		cfg.sortDependencyManagement = sortDependencyManagement;
diff --git a/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java b/testlib/src/test/java/com/diffplug/spotless/json/gson/GsonStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.diffplug.spotless.json.gson;
 
+import static com.diffplug.spotless.json.gson.GsonStep.DEFAULT_VERSION;
+
 import java.io.File;
 
 import org.assertj.core.api.Assertions;
@@ -28,8 +30,6 @@
 
 public class GsonStepTest extends JsonFormatterStepCommonTests {
 
-	private static final String DEFAULT_VERSION = "2.10.1";
-
 	@Test
 	void handlesComplexNestedObject() {
 		doWithResource("cucumberJsonSampleGson");

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,10 @@ tasks.withType(Test).configureEach {`
`17`	`17`	`maxRetries = 2`
`18`	`18`	`maxFailures = 10`
`19`	`19`	`}`
`20`		`-`
`21`		`- // There are only 2 cores in each GitHub Action Runner, we use all of them here.`
`22`		`- maxParallelForks = Runtime.getRuntime().availableProcessors()`
`23`		`- } else {`
`24`		`- // https://docs.gradle.org/8.4/userguide/performance.html#execute_tests_in_parallel`
`25`		`- maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1`
`26`	`20`	`}`
	`21`	`+`
	`22`	`+ // https://docs.gradle.org/8.8/userguide/performance.html#execute_tests_in_parallel`
	`23`	`+ maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1`
`27`	`24`	`}`
`28`	`25`	`tasks.named('test').configure {`
`29`	`26`	`useJUnitPlatform {`