From 5cfe117fd75e4ca63c5fd5b08f07d9427aeaae50 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 15 May 2019 15:50:18 +0300
Subject: [PATCH] Gradle, js: use project.whenEvaluated instead of
 project.afterEvaluate

---
 .../jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt  | 7 +++++--
 .../gradle/targets/js/subtargets/KotlinJsSubTarget.kt      | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt
index 3343fef31e1..5daa6289aba 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolver.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
 import org.jetbrains.kotlin.gradle.targets.js.internal.RewriteSourceMapFilterReader
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
@@ -304,8 +305,10 @@ internal class NpmResolver private constructor(val rootProject: Project) {
         val npmProject = project.npmProject
         val kotlin2JsCompile = compilation.compileKotlinTask
         if (npmProject.compileOutputCopyDest != null) {
-            if (kotlin2JsCompile.outputFile.exists()) {
-                visitCompile(project.npmProject, kotlin2JsCompile)
+            project.whenEvaluated {
+                if (kotlin2JsCompile.outputFile.exists()) {
+                    visitCompile(project.npmProject, kotlin2JsCompile)
+                }
             }
 
             kotlin2JsCompile.doLast {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
index e2a06596351..7ec1013e752 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.subtargets
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
@@ -79,7 +80,7 @@ abstract class KotlinJsSubTarget(
         registerTestTaskInAggregate(testJs, target.testTask.doGetTask())
         registerTestTask(testJs)
 
-        project.afterEvaluate {
+        project.whenEvaluated {
             testJs.configure {
                 if (it.testFramework == null) {
                     configureDefaultTestFramework(it)