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

[imltogradle] Replace "Exported transitive dependency" with original module name reference

Browse Source
This commit is contained in:
Nikita Bobko
2021-05-28 13:26:40 +02:00
parent 6a7770573c
commit af12b2fdf0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/ide-iml-to-gradle-generator/src/org/jetbrains/kotlin/generators/imltogradle/Main.kt
+1 -3
View File
@@ -162,9 +162,7 @@ fun convertJpsModuleDependency(dep: JpsModuleDependency): List<JpsLikeDependency
.map { it.copy(scope = it.scope intersectCompileClasspath dep.scope) } .map { it.copy(scope = it.scope intersectCompileClasspath dep.scope) }
.filter { it.scope != JpsJavaDependencyScope.RUNTIME } // We are interested only in transitive dependencies which affect compilation .filter { it.scope != JpsJavaDependencyScope.RUNTIME } // We are interested only in transitive dependencies which affect compilation
.flatMap { convertIntellijDependencyNotFollowingTransitive(it, dep.isExported).asSequence() } .flatMap { convertIntellijDependencyNotFollowingTransitive(it, dep.isExported).asSequence() }
.mapIndexed { index, jpsLikeDependency -> .map { JpsLikeDependencyWithComment(it, "'$moduleName' dependency") }
if (index != 0) JpsLikeDependencyWithComment(jpsLikeDependency, "Exported transitive dependency") else jpsLikeDependency
}
.toList() .toList()
} }
else -> error("Cannot convert module dependency to Gradle $dep") else -> error("Cannot convert module dependency to Gradle $dep")