From 5ef442889a9f0379318b2bfab15f83cdae8478c6 Mon Sep 17 00:00:00 2001 From: Tony Robalik Date: Wed, 29 Jan 2025 13:19:25 -0800 Subject: [PATCH] build: fix deprecation warning by mangling attributes instead. --- shadowed/antlr/build.gradle.kts | 7 +++++-- shadowed/asm-relocated/build.gradle.kts | 7 +++++-- shadowed/kotlin-editor-relocated/build.gradle.kts | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/shadowed/antlr/build.gradle.kts b/shadowed/antlr/build.gradle.kts index f62cafbdf..9017ef0e0 100644 --- a/shadowed/antlr/build.gradle.kts +++ b/shadowed/antlr/build.gradle.kts @@ -96,8 +96,11 @@ tasks.assemble { val javaComponent = components["java"] as AdhocComponentWithVariants listOf("apiElements", "runtimeElements").forEach { unpublishable -> - // Hide the un-shadowed variants in local consumption - configurations[unpublishable].isCanBeConsumed = false + // Hide the un-shadowed variants in local consumption, by mangling their attributes + configurations[unpublishable].attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + // Hide the un-shadowed variants in publishing javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } } diff --git a/shadowed/asm-relocated/build.gradle.kts b/shadowed/asm-relocated/build.gradle.kts index 578c9697e..eeae3d59f 100644 --- a/shadowed/asm-relocated/build.gradle.kts +++ b/shadowed/asm-relocated/build.gradle.kts @@ -61,8 +61,11 @@ tasks.assemble { val javaComponent = components["java"] as AdhocComponentWithVariants listOf("apiElements", "runtimeElements").forEach { unpublishable -> - // Hide the un-shadowed variants in local consumption - configurations[unpublishable].isCanBeConsumed = false + // Hide the un-shadowed variants in local consumption, by mangling their attributes + configurations[unpublishable].attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + // Hide the un-shadowed variants in publishing javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } } diff --git a/shadowed/kotlin-editor-relocated/build.gradle.kts b/shadowed/kotlin-editor-relocated/build.gradle.kts index 3fb75443e..425733596 100644 --- a/shadowed/kotlin-editor-relocated/build.gradle.kts +++ b/shadowed/kotlin-editor-relocated/build.gradle.kts @@ -63,8 +63,11 @@ tasks.assemble { val javaComponent = components["java"] as AdhocComponentWithVariants listOf("apiElements", "runtimeElements").forEach { unpublishable -> - // Hide the un-shadowed variants in local consumption - configurations[unpublishable].isCanBeConsumed = false + // Hide the un-shadowed variants in local consumption, by mangling their attributes + configurations[unpublishable].attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + // Hide the un-shadowed variants in publishing javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } }