Build: Import embedded configuration as runtime in JPS build

This makes Idea import all embedded modules as transitive dependencies

 #KT-29548
This commit is contained in:
Vyacheslav Gerasimov
2019-04-30 21:39:03 +03:00
parent 5782267d26
commit d765bebcfc
2 changed files with 7 additions and 5 deletions
+6
View File
@@ -35,6 +35,12 @@ fun org.jetbrains.gradle.ext.JUnit.configureForKotlin() {
if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
allprojects {
apply(mapOf("plugin" to "idea"))
afterEvaluate {
// Make Idea import embedded configuration as transitive dependency
configurations.findByName("embedded")?.let { embedded ->
configurations.findByName("runtime")?.extendsFrom(embedded)
}
}
}
gradle.projectsEvaluated {
+1 -5
View File
@@ -208,11 +208,7 @@ tasks.getByName("check").dependsOn(dexMethodCount)
artifacts {
listOf(mainJar.name, "runtime", "archives").forEach { configurationName ->
add(
configurationName,
// idea can correctly import configurations of shadowJar as transitive dependencies which are required by tests
if (kotlinBuildProperties.isInJpsBuildIdeaSync) reflectShadowJar else result
)
add(configurationName, result)
}
add("archives", modularJar)