From c9ad09f4dcaae7792cdf27fbdc8c718443d0ad51 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 18 Dec 2023 21:26:23 +0100 Subject: [PATCH] [Gradle] Fix deprecated buildDir access in PublicPackageJsonTask ^KT-62527 In Progress --- .../gradle/targets/js/npm/PublicPackageJsonTask.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt index cf8e00b7e37..22a4c4462a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt @@ -17,6 +17,7 @@ import org.gradle.api.tasks.TaskAction import org.gradle.work.DisableCachingByDefault import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject.Companion.PACKAGE_JSON import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.PreparedKotlinCompilationNpmResolution +import org.jetbrains.kotlin.gradle.utils.getFile import org.jetbrains.kotlin.gradle.utils.property import java.io.File @@ -71,10 +72,11 @@ abstract class PublicPackageJsonTask : get() = compilationResolution.externalNpmDependencies private val defaultPackageJsonFile by lazy { - project.buildDir - .resolve("tmp") - .resolve(name) - .resolve(PACKAGE_JSON) + project.layout.buildDirectory + .dir("tmp") + .map { it.dir(name) } + .map { it.file(PACKAGE_JSON) } + .getFile() } @get:OutputFile