From 7864c40bb1a86bd5959c6476330a75f151f47e2f Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 17 Jun 2019 01:20:06 +0300
Subject: [PATCH] Build: Force child projects evaluation while importing jps

---
 gradle/jps.gradle.kts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 7a2dd7efb91..81f109a349f 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -1,6 +1,5 @@
 @file:Suppress("UnstableApiUsage")
 
-import org.gradle.api.internal.project.ProjectInternal
 import org.jetbrains.gradle.ext.*
 import org.jetbrains.kotlin.ideaExt.*
 
@@ -53,6 +52,10 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
                     inheritOutputDirs = true
                 }
             }
+            
+            if (this != rootProject) {
+                evaluationDependsOn(path)
+            }
         }
 
         rootProject.idea {
@@ -298,7 +301,6 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.kotlinc() {
 
 fun NamedDomainObjectContainer<TopLevelArtifact>.ideaPlugin() {
     val ideaPluginProject = project(":prepare:idea-plugin")
-    (ideaPluginProject as ProjectInternal).evaluate()
     val libraries by ideaPluginProject.configurations
     val jpsPlugin by ideaPluginProject.configurations