From aa3b653847f94320a4d3c5d54d97fc7be142b54f Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Mon, 21 Feb 2022 16:35:13 +0300 Subject: [PATCH] [Build] dependencies-maven-all: use `ArchiveOperations` service `normalizeComponentsXmlEndings` task was using `zipTree` method of `project`. The `ArchiveOperations` method should be used to work properly with configuration cache. #KT-44611 In Progress --- libraries/scripting/dependencies-maven-all/build.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index 5627f59028f..48c2807698e 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.transformers.ComponentsXmlResourceTransformer import org.gradle.internal.jvm.Jvm +import org.gradle.kotlin.dsl.support.serviceOf description = "Shaded Maven dependencies resolver" @@ -72,10 +73,12 @@ val normalizeComponentsXmlEndings by tasks.registering { dependsOn(relocatedJar) val outputDirectory = buildDir.resolve(name) val outputFile = outputDirectory.resolve(ComponentsXmlResourceTransformer.COMPONENTS_XML_PATH) + val relocatedJarFile = project.provider { relocatedJar.get().singleOutputFile() } + val archiveOperations = serviceOf() outputs.file(outputFile) doFirst { - val componentsXml = zipTree(relocatedJar.get().singleOutputFile()).matching { + val componentsXml = archiveOperations.zipTree(relocatedJarFile.get()).matching { include { it.path == ComponentsXmlResourceTransformer.COMPONENTS_XML_PATH } }.single().readText() val processedComponentsXml = componentsXml.replace("\r\n", "\n")