From 633e2785b55d7c2472916526f34e4219093d0344 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 | 17 +++++++++++------ shadowed/asm-relocated/build.gradle.kts | 17 +++++++++++------ .../kotlin-editor-relocated/build.gradle.kts | 17 +++++++++++------ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/shadowed/antlr/build.gradle.kts b/shadowed/antlr/build.gradle.kts index f62cafbdf..f3a6694e6 100644 --- a/shadowed/antlr/build.gradle.kts +++ b/shadowed/antlr/build.gradle.kts @@ -95,9 +95,14 @@ 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 publishing - javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } -} +listOf("apiElements", "runtimeElements") + .map { configurations[it] } + .forEach { unpublishable -> + // Hide the un-shadowed variants in local consumption, by mangling their attributes + unpublishable.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + + // Hide the un-shadowed variants in publishing + javaComponent.withVariantsFromConfiguration(unpublishable) { skip() } + } diff --git a/shadowed/asm-relocated/build.gradle.kts b/shadowed/asm-relocated/build.gradle.kts index 578c9697e..e961f43d2 100644 --- a/shadowed/asm-relocated/build.gradle.kts +++ b/shadowed/asm-relocated/build.gradle.kts @@ -60,9 +60,14 @@ 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 publishing - javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } -} +listOf("apiElements", "runtimeElements") + .map { configurations[it] } + .forEach { unpublishable -> + // Hide the un-shadowed variants in local consumption, by mangling their attributes + unpublishable.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + + // Hide the un-shadowed variants in publishing + javaComponent.withVariantsFromConfiguration(unpublishable) { skip() } + } diff --git a/shadowed/kotlin-editor-relocated/build.gradle.kts b/shadowed/kotlin-editor-relocated/build.gradle.kts index 3fb75443e..7e936ef6a 100644 --- a/shadowed/kotlin-editor-relocated/build.gradle.kts +++ b/shadowed/kotlin-editor-relocated/build.gradle.kts @@ -62,9 +62,14 @@ 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 publishing - javaComponent.withVariantsFromConfiguration(configurations[unpublishable]) { skip() } -} +listOf("apiElements", "runtimeElements") + .map { configurations[it] } + .forEach { unpublishable -> + // Hide the un-shadowed variants in local consumption, by mangling their attributes + unpublishable.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named("DO_NOT_USE")) + } + + // Hide the un-shadowed variants in publishing + javaComponent.withVariantsFromConfiguration(unpublishable) { skip() } + }