Code cleanup.

Author: ianbrandt

build-logic/src/main/kotlin/org.sdkotlin.buildlogic.custom-resources-consumer.gradle.kts

@@ -5,9 +5,9 @@ import org.sdkotlin.buildlogic.attributes.ResourceAttributes.RESOURCE_ATTRIBUTE
 
 dependencies {
 
-	// Register a new attribute key for variant-aware consumption
-	// of "custom" resources dependencies.
 	attributesSchema {
+		// Register a new attribute key for variant-aware consumption of
+		// "custom" resources dependencies.
 		attribute(RESOURCE_ATTRIBUTE)
 	}
 

build-logic/src/main/kotlin/org/sdkotlin/buildlogic/attributes/ResourceAttributes.kt

@@ -18,7 +18,7 @@ import org.sdkotlin.buildlogic.attributes.ResourceAttributes.applyResourceAttrib
 /**
  * An attribute type for resource variants.
  */
-interface ResourceAttributeType : Named {
+interface ResourceAttribute : Named {
 	override fun getName(): String = "ResourceAttribute"
 }
 
@@ -30,24 +30,23 @@ object ResourceAttributes {
 	/**
 	 * An attribute for resource dependency variants.
 	 */
-	val RESOURCE_ATTRIBUTE: Attribute<ResourceAttributeType> =
+	val RESOURCE_ATTRIBUTE: Attribute<ResourceAttribute> =
 		Attribute.of(
 			ResourceAttributes::class.qualifiedName!!,
-			ResourceAttributeType::class.java
+			ResourceAttribute::class.java
 		)
 
 	/**
 	 * Helper function to set the standard attributes for resource dependency
 	 * variants.
 	 */
 	fun AttributeContainer.applyResourceAttributes(
-		objectFactory: ObjectFactory,
+		objects: ObjectFactory,
 		resourceAttributeValue: String
 	) {
-		attribute(BUNDLING_ATTRIBUTE, objectFactory.named(EXTERNAL))
-		attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objectFactory.named(RESOURCES))
-		attribute(RESOURCE_ATTRIBUTE,
-			objectFactory.named(resourceAttributeValue))
+		attribute(BUNDLING_ATTRIBUTE, objects.named(EXTERNAL))
+		attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(RESOURCES))
+		attribute(RESOURCE_ATTRIBUTE, objects.named(resourceAttributeValue))
 	}
 }
 

subprojects/app/build.gradle.kts

@@ -41,6 +41,9 @@ tasks {
 
 	register("printCustomClasspath") {
 
+		group = "custom"
+		description = "Print the custom classpath"
+
 		val fileCollection: FileCollection =
 			configurations.runtimeClasspath.get().incoming.artifactView {