From a2b688eb31d50f79decda8a19bd961f683390f65 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 20 Sep 2023 14:48:02 +0200 Subject: [PATCH] [Build] Preserve original jar with unshaded postfix in subplugin example Otherwise we have two tasks writing output to the same file. That behavior confuses Gradle. --- .../examples/kotlin-gradle-subplugin-example/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index 5455a0a62f5..177c3e87b46 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -48,15 +48,18 @@ extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false" //} def sourceSet = sourceSets.main -def jarTask = tasks.named(sourceSet.jarTaskName, Jar) +def jarTask = tasks.named(sourceSet.jarTaskName, Jar) { + archiveClassifier.set("unshaded") +} def shadowJarTask = EmbeddableKt.embeddableCompilerDummyForDependenciesRewriting( project, "${EmbeddableKt.EMBEDDABLE_COMPILER_TASK_NAME}${sourceSet.jarTaskName.capitalize()}" ) { + def emptyClassifier = provider { "" } RepoArtifacts.setupPublicJar( it, jarTask.flatMap { it.archiveBaseName }, - jarTask.flatMap { it.archiveClassifier } + jarTask.flatMap { emptyClassifier } ) RepoArtifacts.addEmbeddedRuntime(it) it.from(sourceSet.output)