azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix deprecated buildDir access in PublicPackageJsonTask

Browse Source 
^KT-62527 In Progress
This commit is contained in:
Yahor Berdnikau
2023-12-18 21:26:23 +01:00
committed by Space Team
parent 28405fceac
commit c9ad09f4dc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt
+6 -4
View File
@@ -17,6 +17,7 @@ import org.gradle.api.tasks.TaskAction
import org.gradle.work.DisableCachingByDefault 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.NpmProject.Companion.PACKAGE_JSON
import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.PreparedKotlinCompilationNpmResolution 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 org.jetbrains.kotlin.gradle.utils.property
import java.io.File import java.io.File
@@ -71,10 +72,11 @@ abstract class PublicPackageJsonTask :
get() = compilationResolution.externalNpmDependencies get() = compilationResolution.externalNpmDependencies
private val defaultPackageJsonFile by lazy { private val defaultPackageJsonFile by lazy {
project.buildDir project.layout.buildDirectory
.resolve("tmp") .dir("tmp")
.resolve(name) .map { it.dir(name) }
.resolve(PACKAGE_JSON) .map { it.file(PACKAGE_JSON) }
.getFile()
} }
@get:OutputFile @get:OutputFile