Fix ktlint tests

Author: Goooler

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

@@ -39,7 +39,7 @@ private KtLintStep() {}
 	private static final String DEFAULT_VERSION = "1.0.0";
 	static final String NAME = "ktlint";
 	static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
-	static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	public static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
 
 	public static FormatterStep create(Provisioner provisioner) {
 		return create(defaultVersion(), provisioner);

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

@@ -34,6 +34,7 @@
 import com.diffplug.common.base.Unhandled;
 import com.diffplug.common.collect.ImmutableList;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.kotlin.KtLintStep;
 
 /** Should be package-private. */
 class GradleProvisioner {
@@ -121,7 +122,14 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.setCanBeConsumed(false);
 				config.setVisible(false);
 				config.attributes(attr -> {
-					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+					final String type;
+					// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
+					if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
+						type = Bundling.SHADOWED;
+					} else {
+						type = Bundling.EXTERNAL;
+					}
+					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
 				});
 				return config.resolve();
 			} catch (Exception e) {

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

@@ -73,6 +73,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlin {",
 				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java

@@ -52,6 +52,7 @@ void withExperimentalEditorConfigOverride() throws IOException {
 				"spotless {",
 				"    kotlinGradle {",
 				"        ktlint().editorConfigOverride([",
+				"            ktlint_code_style: \"intellij_idea\",",
 				"            ktlint_experimental: \"enabled\",",
 				"            ij_kotlin_allow_trailing_comma: true,",
 				"            ij_kotlin_allow_trailing_comma_on_call_site: true",

testlib/src/main/java/com/diffplug/spotless/TestProvisioner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 import com.diffplug.common.base.Suppliers;
 import com.diffplug.common.collect.ImmutableSet;
 import com.diffplug.common.io.Files;
+import com.diffplug.spotless.kotlin.KtLintStep;
 
 public class TestProvisioner {
 	public static Project gradleProject(File dir) {
@@ -70,7 +71,14 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.setTransitive(withTransitives);
 			config.setDescription(mavenCoords.toString());
 			config.attributes(attr -> {
-				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
+				final String type;
+				// See https://github.com/diffplug/spotless/pull/1808#discussion_r1321682984.
+				if (mavenCoords.stream().anyMatch(it -> it.startsWith(KtLintStep.MAVEN_COORDINATE_1_DOT))) {
+					type = Bundling.SHADOWED;
+				} else {
+					type = Bundling.EXTERNAL;
+				}
+				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, type));
 			});
 			try {
 				return config.resolve();

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

@@ -80,8 +80,8 @@ void works1_0_0() {
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+						"rule: standard:no-empty-file\n" +
+						"File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test
@@ -90,8 +90,8 @@ void behavior() {
 		StepHarnessWithFile.forStep(this, step)
 				.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
 				.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
-						"rule: standard:no-wildcard-imports\n" +
-						"Wildcard import");
+						"rule: standard:no-empty-file\n" +
+						"File 'unsolvable.dirty' should not be empty");
 	}
 
 	@Test