diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 2564a449677..64d8d3c33dc 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -185,26 +185,24 @@ val sourcesJar = tasks.register("sourcesJar") { addArtifact("archives", sourcesJar) addArtifact("sources", sourcesJar) +val intermediate = when { + kotlinBuildProperties.proguard -> proguard + kotlinBuildProperties.relocation -> stripMetadata + else -> reflectShadowJar +} + val result by task { - val task = when { - kotlinBuildProperties.proguard -> proguard - kotlinBuildProperties.relocation -> stripMetadata - else -> reflectShadowJar - } - - dependsOn(task) - + dependsOn(intermediate) from { - zipTree(task.get().outputs.files.singleFile) + zipTree(intermediate.get().outputs.files.singleFile) } - callGroovy("manifestAttributes", manifest, project, "Main") } val modularJar by task { - dependsOn(proguard) + dependsOn(intermediate) archiveClassifier.set("modular") - from(zipTree(file(proguardOutput))) + from(zipTree(intermediate.get().outputs.files.single())) from(zipTree(reflectShadowJar.get().archivePath)) { include("META-INF/versions/**") }