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

The friend module identification has regressed recently

Browse Source
This commit is contained in:
Alexander Gorshenev
2019-10-03 01:38:35 +03:00
committed by alexander-gorshenev
parent 18d9e9b2b5
commit b7a0546634
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+5 -4
View File
@@ -153,10 +153,11 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
// TODO: pass logger attached to message collector here. // TODO: pass logger attached to message collector here.
).libraryResolver() ).libraryResolver()
val resolvedLibraries = libraryResolver.resolveWithDependencies(unresolvedLibraries, true, true, true) val resolvedLibraries = libraryResolver.resolveWithDependencies(unresolvedLibraries, true, true, true)
val friendDependencies = resolvedLibraries.getFullList()
.filter { val friendAbsolutePaths = friendLibraries.map { File(it).absolutePath }
it.moduleName in friendLibraries val friendDependencies = resolvedLibraries.getFullList().filter {
} it.libraryFile.absolutePath in friendAbsolutePaths
}
val produceKind = produceMap[arguments.irProduceOnly] val produceKind = produceMap[arguments.irProduceOnly]
if (produceKind == null) { if (produceKind == null) {