Code cleanup.

ianbrandt · ianbrandt · commit 619775bac4d5 · 2024-11-03T15:44:19.000-08:00
diff --git a/build-logic/src/main/kotlin/org.sdkotlin.buildlogic.custom-resources.gradle.kts b/build-logic/src/main/kotlin/org.sdkotlin.buildlogic.custom-resources.gradle.kts
@@ -77,8 +77,10 @@ tasks {
 					withVariantReselection()
 
 					attributes {
-						applyLibraryElementsAttributes(objects,
-							CUSTOM_RESOURCES)
+						applyLibraryElementsAttributes(
+							objects,
+							libraryElementsAttributeValue = CUSTOM_RESOURCES
+						)
 					}
 				}.files
 		}
@@ -100,8 +102,10 @@ tasks {
 					withVariantReselection()
 
 					attributes {
-						applyLibraryElementsAttributes(objects,
-							CLASSES_AND_RESOURCES)
+						applyLibraryElementsAttributes(
+							objects,
+							libraryElementsAttributeValue = CLASSES_AND_RESOURCES
+						)
 					}
 				}.files
 		}
diff --git a/build-logic/src/main/kotlin/org/sdkotlin/buildlogic/attributes/CustomResources.kt b/build-logic/src/main/kotlin/org/sdkotlin/buildlogic/attributes/CustomResources.kt
@@ -11,5 +11,5 @@ object CustomResources {
 	 * The [LIBRARY_ELEMENTS_ATTRIBUTE] value for the "custom resources"
 	 * dependency variant.
 	 */
-	const val CUSTOM_RESOURCES = "custom resources"
+	const val CUSTOM_RESOURCES = "custom-resources"
 }

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,10 @@ tasks {`
`77`	`77`	`withVariantReselection()`
`78`	`78`
`79`	`79`	`attributes {`
`80`		`- applyLibraryElementsAttributes(objects,`
`81`		`- CUSTOM_RESOURCES)`
	`80`	`+ applyLibraryElementsAttributes(`
	`81`	`+ objects,`
	`82`	`+ libraryElementsAttributeValue = CUSTOM_RESOURCES`
	`83`	`+ )`
`82`	`84`	`}`
`83`	`85`	`}.files`
`84`	`86`	`}`
`@@ -100,8 +102,10 @@ tasks {`
`100`	`102`	`withVariantReselection()`
`101`	`103`
`102`	`104`	`attributes {`
`103`		`- applyLibraryElementsAttributes(objects,`
`104`		`- CLASSES_AND_RESOURCES)`
	`105`	`+ applyLibraryElementsAttributes(`
	`106`	`+ objects,`
	`107`	`+ libraryElementsAttributeValue = CLASSES_AND_RESOURCES`
	`108`	`+ )`
`105`	`109`	`}`
`106`	`110`	`}.files`
`107`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ object CustomResources {`
`11`	`11`	`* The [LIBRARY_ELEMENTS_ATTRIBUTE] value for the "custom resources"`
`12`	`12`	`* dependency variant.`
`13`	`13`	`*/`
`14`		`- const val CUSTOM_RESOURCES = "custom resources"`
	`14`	`+ const val CUSTOM_RESOURCES = "custom-resources"`
`15`	`15`	`}`