From cb0d78d443e7d2f90e369053ab9ce43cb39fd7bd Mon Sep 17 00:00:00 2001 From: cristiangarcia Date: Thu, 8 Feb 2024 22:10:29 +0100 Subject: [PATCH] singleOutputFile() method used Task.getProject() and that's not allowed with CC Required for KTI-1553 --- libraries/reflect/build.gradle.kts | 2 +- .../scripting/dependencies-maven-all/build.gradle.kts | 8 ++++---- libraries/tools/kotlin-main-kts/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 6 +++--- .../js-ir-runtime-for-ide/build.gradle.kts | 2 +- .../buildsrc-compat/src/main/kotlin/CommonUtil.kt | 5 +++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 35886241ece..b43c568e5ca 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -234,7 +234,7 @@ val intermediate = when { val result by task { dependsOn(intermediate) from { - zipTree(intermediate.get().singleOutputFile()) + zipTree(intermediate.get().singleOutputFile(layout)) } from(zipTree(provider { reflectShadowJar.get().archiveFile.get().asFile })) { include("META-INF/versions/**") diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index 3efb8a0f1d6..8ec25e180c6 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -83,7 +83,7 @@ val relocatedJar by task { val normalizeComponentsXmlEndings by tasks.registering { dependsOn(relocatedJar) val outputFile = layout.buildDirectory.file("$name/${ComponentsXmlResourceTransformer.COMPONENTS_XML_PATH}") - val relocatedJarFile = project.provider { relocatedJar.get().singleOutputFile() } + val relocatedJarFile = relocatedJar.map { it.singleOutputFile(layout) } val archiveOperations = serviceOf() outputs.file(outputFile) @@ -105,14 +105,14 @@ val normalizedJar by task { archiveClassifier.set("normalized") from { - zipTree(relocatedJar.get().singleOutputFile()).matching { + zipTree(relocatedJar.get().singleOutputFile(layout)).matching { exclude(ComponentsXmlResourceTransformer.COMPONENTS_XML_PATH) } } into(ComponentsXmlResourceTransformer.COMPONENTS_XML_PATH.substringBeforeLast("/")) { from { - normalizeComponentsXmlEndings.get().singleOutputFile() + normalizeComponentsXmlEndings.map { it.singleOutputFile(layout) } } } } @@ -156,7 +156,7 @@ val resultJar by task { dependsOn(pack) setupPublicJar(jarBaseName) from { - zipTree(pack.get().singleOutputFile()) + zipTree(pack.map { it.singleOutputFile(layout) }) } } diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 0d1227ed506..d2efaf885c3 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -120,7 +120,7 @@ val resultJar by task { dependsOn(pack) setupPublicJar(jarBaseName) from { - zipTree(pack.get().singleOutputFile()) + zipTree(pack.map { it.singleOutputFile(layout) }) } } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 24effd8e2e4..a76514b951d 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -315,7 +315,7 @@ val proguard by task { **.class,**.properties,**.kt,**.kotlin_*,**.jnilib,**.so,**.dll,**.txt,**.caps, META-INF/services/**,META-INF/native/**,META-INF/extensions/**,META-INF/MANIFEST.MF, messages/**""".trimIndent()), - provider { packCompiler.get().outputs.files.singleFile } + packCompiler.map { it.outputs.files.singleFile } ) outjars(layout.buildDirectory.file("libs/$compilerBaseName-after-proguard.jar")) @@ -346,7 +346,7 @@ val proguard by task { printconfiguration(layout.buildDirectory.file("compiler.pro.dump")) } -val pack = if (kotlinBuildProperties.proguard) proguard else packCompiler +val pack: TaskProvider = if (kotlinBuildProperties.proguard) proguard else packCompiler val distDir: String by rootProject.extra val jar = runtimeJar { @@ -354,7 +354,7 @@ val jar = runtimeJar { dependsOn(compilerVersion) from { - zipTree(pack.get().singleOutputFile()) + pack.map { zipTree(it.singleOutputFile(layout)) } } from { diff --git a/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts index 5ddcc834797..d60d3b84c47 100644 --- a/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/js-ir-runtime-for-ide/build.gradle.kts @@ -17,7 +17,7 @@ idePluginDependency { from { val klibTask = project(jsRuntimeProjectName).tasks.getByName(klibTaskName) - zipTree(klibTask.singleOutputFile()) + zipTree(klibTask.singleOutputFile(layout)) } } } \ No newline at end of file diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CommonUtil.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CommonUtil.kt index 237f1e23512..3212a56e62b 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CommonUtil.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/CommonUtil.kt @@ -5,6 +5,7 @@ import groovy.lang.Closure import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.file.CopySourceSpec +import org.gradle.api.file.ProjectLayout import org.gradle.api.file.SourceDirectorySet import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.JavaExec @@ -80,9 +81,9 @@ fun Project.findJavaPluginExtension(): JavaPluginExtension? = extensions.findByT fun JavaExec.pathRelativeToWorkingDir(file: File): String = file.relativeTo(workingDir).invariantSeparatorsPath -fun Task.singleOutputFile(): File = when (this) { +fun Task.singleOutputFile(layout: ProjectLayout): File = when (this) { is AbstractArchiveTask -> archiveFile.get().asFile - is ProGuardTask -> project.file(outJarFiles.single()!!) + is ProGuardTask -> layout.files(outJarFiles.single()!!).singleFile else -> outputs.files.singleFile }