bump diktat to 1.2.1 and add validation of min version

Author: nulls

CHANGES.md

@@ -13,7 +13,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [2.26.2] - 2022-06-11
 ### Fixed

lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java

@@ -30,7 +30,9 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String DEFAULT_VERSION = "1.2.0";
+	private static final String MIN_SUPPORTED_VERSION = "1.2.1";
+
+	private static final String DEFAULT_VERSION = "1.2.1";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
@@ -56,6 +58,9 @@ public static FormatterStep createForScript(String versionDiktat, Provisioner pr
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
+		if (BadSemver.version(versionDiktat) < BadSemver.version(MIN_SUPPORTED_VERSION)) {
+			throw new IllegalStateException("Diktat supported for version " + MIN_SUPPORTED_VERSION + " and later");
+		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,

plugin-gradle/CHANGES.md

@@ -6,7 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [6.7.2] - 2022-06-11
 ### Fixed

plugin-maven/CHANGES.md

@@ -6,7 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 ### Added
 * Support for `MAC_CLASSIC` (`\r`) line ending ([#1243](https://github.com/diffplug/spotless/pull/1243) fixes [#1196](https://github.com/diffplug/spotless/issues/1196))
 ### Fixed
-* Bump default `diktat` version to latest `1.1.0` -> `1.2.0`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+* Bump default `diktat` version to latest `1.1.0` -> `1.2.1`. ([saveourtool/diktat#1399](https://github.com/saveourtool/diktat/issues/1399))
+  * Note that support `diktat` version `1.2.1` is or higher
+  * The property `userData` is removed
 
 ## [2.22.8] - 2022-06-11
 ### Fixed

testlib/src/test/java/com/diffplug/spotless/kotlin/DiktatStepTest.java

@@ -18,8 +18,8 @@
 import static com.diffplug.spotless.FileSignature.signAsList;
 
 import java.io.File;
-import java.util.Collections;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FileSignature;
@@ -50,12 +50,11 @@ void behavior() throws Exception {
 
 	@Test
 	void behaviorConf() throws Exception {
-
 		String configPath = "src/main/kotlin/diktat-analysis.yml";
 		File conf = setFile(configPath).toResource("kotlin/diktat/diktat-analysis.yml");
 		FileSignature config = signAsList(conf);
 
-		FormatterStep step = DiktatStep.create("1.2.0", TestProvisioner.mavenCentral(), config);
+		FormatterStep step = DiktatStep.create("1.2.1", TestProvisioner.mavenCentral(), config);
 		StepHarness.forStep(step)
 				.testResourceException("kotlin/diktat/Unsolvable.kt", assertion -> {
 					assertion.isInstanceOf(AssertionError.class);
@@ -71,4 +70,15 @@ void behaviorConf() throws Exception {
 				});
 	}
 
+	@Test
+	void notSupportedVersion() {
+		final IllegalStateException notSupportedException = Assertions.assertThrows(IllegalStateException.class,
+			() -> DiktatStep.create("1.2.0", TestProvisioner.mavenCentral()));
+		Assertions.assertTrue(
+			notSupportedException.getMessage().contains("Diktat supported for version 1.2.1 and later")
+		);
+
+		Assertions.assertDoesNotThrow(() -> DiktatStep.create("1.2.1", TestProvisioner.mavenCentral()));
+		Assertions.assertDoesNotThrow(() -> DiktatStep.create("2.0.0", TestProvisioner.mavenCentral()));
+	}
 }