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

Build: Force child projects evaluation while importing jps

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-06-17 01:20:06 +03:00
parent 947783833f
commit 7864c40bb1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/jps.gradle.kts
+4 -2
View File
@@ -1,6 +1,5 @@
@file:Suppress("UnstableApiUsage") @file:Suppress("UnstableApiUsage")
import org.gradle.api.internal.project.ProjectInternal
import org.jetbrains.gradle.ext.* import org.jetbrains.gradle.ext.*
import org.jetbrains.kotlin.ideaExt.* import org.jetbrains.kotlin.ideaExt.*
@@ -53,6 +52,10 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
inheritOutputDirs = true inheritOutputDirs = true
} }
} }
if (this != rootProject) {
evaluationDependsOn(path)
}
} }
rootProject.idea { rootProject.idea {
@@ -298,7 +301,6 @@ fun NamedDomainObjectContainer<TopLevelArtifact>.kotlinc() {
fun NamedDomainObjectContainer<TopLevelArtifact>.ideaPlugin() { fun NamedDomainObjectContainer<TopLevelArtifact>.ideaPlugin() {
val ideaPluginProject = project(":prepare:idea-plugin") val ideaPluginProject = project(":prepare:idea-plugin")
(ideaPluginProject as ProjectInternal).evaluate()
val libraries by ideaPluginProject.configurations val libraries by ideaPluginProject.configurations
val jpsPlugin by ideaPluginProject.configurations val jpsPlugin by ideaPluginProject.configurations