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

[Gradle, JS] Use one folder for sync tasks

Browse Source
This commit is contained in:
Ilya Goncharov
2021-03-17 20:17:09 +03:00
committed by TeamCityServer
parent 17da240910
commit 8ffe70cb4d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+1 -1
View File
@@ -58,7 +58,7 @@ class Kotlin2JsIrGradlePluginIT : AbstractKotlin2JsGradlePluginIT(true) {
assertTasksExecuted(":compileProductionExecutableKotlinJs") assertTasksExecuted(":compileProductionExecutableKotlinJs")
assertFileExists("build/js/packages/kotlin-js-nodejs/kotlin/productionExecutable/kotlin-js-nodejs.js") assertFileExists("build/js/packages/kotlin-js-nodejs/kotlin/kotlin-js-nodejs.js")
} }
File("${projectDir.canonicalPath}/src").deleteRecursively() File("${projectDir.canonicalPath}/src").deleteRecursively()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+1 -2
View File
@@ -110,7 +110,6 @@ constructor(
.resolve(COMPILE_SYNC) .resolve(COMPILE_SYNC)
.resolve(compilation.name) .resolve(compilation.name)
.resolve(binary.name) .resolve(binary.name)
.resolve(binary.mode.name.toLowerCase())
.resolve(npmProject.main) .resolve(npmProject.main)
.canonicalPath .canonicalPath
@@ -133,7 +132,7 @@ constructor(
task.from(project.tasks.named(compilation.processResourcesTaskName)) task.from(project.tasks.named(compilation.processResourcesTaskName))
task.into( task.into(
npmProject.dist.resolve(binary.name) npmProject.dist
) )
} }
} }