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

[Gradle, JS] Compatibility with lower than 4.9

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-05 17:55:30 +03:00
parent 0129b71cfe
commit 196907b2ef
2 changed files with 2 additions and 2 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/ir/KotlinJsIrSubTarget.kt
+1 -1
View File
@@ -96,7 +96,7 @@ abstract class KotlinJsIrSubTarget(
testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP
testJs.description = testTaskDescription testJs.description = testTaskDescription
testJs.inputFileProperty.set(compilation.developmentLinkTask.flatMap { it.outputFileProperty }) testJs.inputFileProperty.set(compilation.developmentLinkTask.map { it.outputFileProperty.get() })
testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask) testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt
+1 -1
View File
@@ -34,7 +34,7 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) :
compilation: KotlinJsIrCompilation compilation: KotlinJsIrCompilation
) { ) {
val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) { val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) {
inputFileProperty.set(compilation.developmentLinkTask.flatMap { it.outputFileProperty }) inputFileProperty.set(compilation.developmentLinkTask.map { it.outputFileProperty.get() })
} }
target.runTask.dependsOn(runTaskHolder) target.runTask.dependsOn(runTaskHolder)
} }