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

[Gradle, JS] Rename package-candidate.json to pre-package.json

Browse Source 
^KT-39515 fixed
This commit is contained in:
Ilya Goncharov
2020-07-10 18:38:52 +03:00
parent 6a0315fe7a
commit bbb3032e1c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt
+3 -3
View File
@@ -46,8 +46,8 @@ open class NpmProject(val compilation: KotlinJsCompilation) {
val packageJsonFile: File val packageJsonFile: File
get() = dir.resolve(PACKAGE_JSON) get() = dir.resolve(PACKAGE_JSON)
val packageCandidateJsonFile: File val prePackageJsonFile: File
get() = dir.resolve(PACKAGE_CANDIDATE_JSON) get() = dir.resolve(PRE_PACKAGE_JSON)
val packageJsonTaskName: String val packageJsonTaskName: String
get() = compilation.disambiguateName("packageJson") get() = compilation.disambiguateName("packageJson")
@@ -143,7 +143,7 @@ open class NpmProject(val compilation: KotlinJsCompilation) {
companion object { companion object {
const val PACKAGE_JSON = "package.json" const val PACKAGE_JSON = "package.json"
const val PACKAGE_CANDIDATE_JSON = "package-candidate.json" const val PRE_PACKAGE_JSON = "pre-package.json"
const val NODE_MODULES = "node_modules" const val NODE_MODULES = "node_modules"
const val DIST_FOLDER = "kotlin" const val DIST_FOLDER = "kotlin"
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PackageJsonUpToDateCheck.kt
+1 -1
View File
@@ -24,7 +24,7 @@ class PackageJsonUpToDateCheck(val npmProject: NpmProject) {
if (packageJsonHashFile.exists()) packageJsonHashFile.readText() else null if (packageJsonHashFile.exists()) packageJsonHashFile.readText() else null
} }
private val packageJsonFile = npmProject.packageCandidateJsonFile private val packageJsonFile = npmProject.prePackageJsonFile
private val hash by lazy { private val hash by lazy {
val hasher = (project as ProjectInternal).services.get(FileHasher::class.java) val hasher = (project as ProjectInternal).services.get(FileHasher::class.java)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt
+1 -1
View File
@@ -352,7 +352,7 @@ internal class KotlinCompilationNpmResolver(
} }
if (!skipWriting) { if (!skipWriting) {
packageJson.saveTo(npmProject.packageCandidateJsonFile) packageJson.saveTo(npmProject.prePackageJsonFile)
} }
return KotlinCompilationNpmResolution( return KotlinCompilationNpmResolution(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
+1 -1
View File
@@ -47,7 +47,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
@get:OutputFile @get:OutputFile
val packageJson: File val packageJson: File
get() = compilationResolver.npmProject.packageCandidateJsonFile get() = compilationResolver.npmProject.prePackageJsonFile
@TaskAction @TaskAction
fun resolve() { fun resolve() {