Add Category.LIBRARY attr to resolve ktlint deps

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:";
-	public static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
+	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

@@ -27,14 +27,14 @@
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.attributes.Bundling;
+import org.gradle.api.attributes.Category;
 import org.gradle.api.initialization.dsl.ScriptHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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 {
@@ -122,14 +122,8 @@ private static Provisioner forConfigurationContainer(Project project, Configurat
 				config.setCanBeConsumed(false);
 				config.setVisible(false);
 				config.attributes(attr -> {
-					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));
+					attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
+					attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 				});
 				return config.resolve();
 			} catch (Exception e) {

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

@@ -32,14 +32,14 @@
 import org.gradle.api.artifacts.ResolveException;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.attributes.Bundling;
+import org.gradle.api.attributes.Category;
 import org.gradle.testfixtures.ProjectBuilder;
 
 import com.diffplug.common.base.Errors;
 import com.diffplug.common.base.StandardSystemProperty;
 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) {
@@ -71,14 +71,8 @@ private static Provisioner createWithRepositories(Consumer<RepositoryHandler> re
 			config.setTransitive(withTransitives);
 			config.setDescription(mavenCoords.toString());
 			config.attributes(attr -> {
-				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));
+				attr.attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
+				attr.attribute(Bundling.BUNDLING_ATTRIBUTE, project.getObjects().named(Bundling.class, Bundling.EXTERNAL));
 			});
 			try {
 				return config.resolve();