Build: configure jps artifacts in gradle.projectsEvaluated

gradle/jps.gradle.kts

@@ -7,7 +7,7 @@ val ideaSandboxDir: File by extra
 val ideaSdkPath: String
     get() = IntellijRootUtils.getIntellijRootDir(rootProject).absolutePath
 
-val intellijUltimateEnabled : Boolean by rootProject.extra
+val intellijUltimateEnabled: Boolean by rootProject.extra
 val ideaUltimatePluginDir: File by rootProject.extra
 val ideaUltimateSandboxDir: File by rootProject.extra
 
@@ -37,8 +37,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
         apply(mapOf("plugin" to "idea"))
     }
 
-    rootProject.afterEvaluate {
+    gradle.projectsEvaluated {
-        allprojects {
+        rootProject.allprojects {
             idea {
                 module {
                     inheritOutputDirs = true
@@ -51,6 +51,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
                 settings {
                     ideArtifacts {
                         generateIdeArtifacts(rootProject, this@ideArtifacts)
+
+                        ideaPlugin()
                     }
 
                     compiler {
@@ -150,16 +152,13 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
             }
         }
     }
+}
 
-    project(":prepare:idea-plugin").afterEvaluate {
+fun NamedDomainObjectContainer<TopLevelArtifact>.ideaPlugin() {
-        val ideaPluginProject = this
+    val ideaPluginProject = project(":prepare:idea-plugin")
-        val libraries by configurations
+    val libraries by ideaPluginProject.configurations
-        val jpsPlugin by configurations
+    val jpsPlugin by ideaPluginProject.configurations
 
-        rootProject.idea {
-            project {
-                settings {
-                    ideArtifacts {
     create("ideaPlugin") {
         directory("Kotlin") {
             directory("kotlinc") {
@@ -183,11 +182,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
             }
         }
     }
-                    }
-                }
-            }
-        }
-    }
 }
 
 val jarArtifactProjects = listOf(