The friend module identification has regressed recently

2019-10-03 01:38:35 +03:00
parent 18d9e9b2b5
commit b7a0546634
1 changed files with 5 additions and 4 deletions
@@ -153,10 +153,11 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
            // TODO: pass logger attached to message collector here.
        ).libraryResolver()
        val resolvedLibraries = libraryResolver.resolveWithDependencies(unresolvedLibraries, true, true, true)
-        val friendDependencies = resolvedLibraries.getFullList()
-            .filter {
-                it.moduleName in friendLibraries
-            }
+
+        val friendAbsolutePaths = friendLibraries.map { File(it).absolutePath }
+        val friendDependencies = resolvedLibraries.getFullList().filter {
+            it.libraryFile.absolutePath in friendAbsolutePaths
+        }

        val produceKind = produceMap[arguments.irProduceOnly]
        if (produceKind == null) {