Skip to content

Extract addVariants for AdhocComponentWithVariants #2271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 1 commit into from
Sep 3, 2026
+32 −12
Merged

Extract addVariants for AdhocComponentWithVariants #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/PublishingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,9 @@ class PublishingTest : BasePluginTest() {
assertThat(result.output)
.contains(
if (addShadowVariant) {
"Adding shadowRuntimeElements variant to Java component."
"Adding shadowRuntimeElements variant to java component."
} else {
"Skipping adding shadowRuntimeElements variant to Java component."
"Skipping adding shadowRuntimeElements variant to java component."
}
)
val assertVariantsCommon = { gmm: GradleModuleMetadata ->
Expand Down
40 changes: 30 additions & 10 deletions src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import org.gradle.api.attributes.LibraryElements
import org.gradle.api.attributes.Usage
import org.gradle.api.attributes.java.TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE
import org.gradle.api.component.AdhocComponentWithVariants
import org.gradle.api.component.ConfigurationVariantDetails
import org.gradle.api.component.SoftwareComponentFactory
import org.gradle.api.logging.Logger
import org.gradle.api.plugins.JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME
import org.gradle.api.tasks.bundling.Jar

Expand Down Expand Up @@ -113,18 +115,36 @@ constructor(private val softwareComponentFactory: SoftwareComponentFactory) : Pl
val shadowRuntimeElements = configurations.shadowRuntimeElements
val shadowComponent = softwareComponentFactory.adhoc(COMPONENT_NAME)
components.add(shadowComponent)
shadowComponent.addVariantsFromConfiguration(shadowRuntimeElements) { variant ->
variant.mapToMavenScope("runtime")
shadowComponent.addVariants(
outgoingConfiguration = shadowRuntimeElements,
logger = logger,
) {
mapToMavenScope("runtime")
}
components.named("java", AdhocComponentWithVariants::class.java) { component ->
component.addVariantsFromConfiguration(shadowRuntimeElements) { variant ->
variant.mapToOptional()
if (shadow.addShadowVariantIntoJavaComponent.get()) {
logger.info("Adding {} variant to Java component.", shadowRuntimeElements.name)
} else {
logger.info("Skipping adding {} variant to Java component.", shadowRuntimeElements.name)
variant.skip()
}
component.addVariants(
outgoingConfiguration = shadowRuntimeElements,
logger = logger,
shouldAdd = shadow.addShadowVariantIntoJavaComponent::get,
) {
mapToOptional()
}
}
}

private fun AdhocComponentWithVariants.addVariants(
outgoingConfiguration: NamedDomainObjectProvider<ConsumableConfiguration>,
logger: Logger,
shouldAdd: () -> Boolean = { true },
action: ConfigurationVariantDetails.() -> Unit,
) {
addVariantsFromConfiguration(outgoingConfiguration) { variant ->
if (shouldAdd()) {
logger.info("Adding {} variant to {} component.", outgoingConfiguration.name, name)
variant.action()
} else {
logger.info("Skipping adding {} variant to {} component.", outgoingConfiguration.name, name)
variant.skip()
}
}
}
Expand Down