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

[JS IR BE] fix multimodule

Browse Source
This commit is contained in:
Anton Bannykh
2018-09-18 21:49:48 +03:00
parent 9041d717a2
commit 8852ef9e75
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+3 -3
View File
@@ -163,8 +163,8 @@ abstract class BasicIrBoxTest(
runtimeFile.write(runtimeResult!!.generatedCode) runtimeFile.write(runtimeResult!!.generatedCode)
} }
val dependencyPaths = config.configuration[JSConfigurationKeys.LIBRARIES]!! val dependencyNames = config.configuration[JSConfigurationKeys.LIBRARIES]!!.map { File(it).name }
val dependencies = listOf(runtimeResult!!.moduleDescriptor) + dependencyPaths.mapNotNull { compilationCache[it]?.moduleDescriptor } val dependencies = listOf(runtimeResult!!.moduleDescriptor) + dependencyNames.mapNotNull { compilationCache[it]?.moduleDescriptor }
val irDependencies = listOf(runtimeResult!!.moduleFragment) + compilationCache.values.map { it.moduleFragment } val irDependencies = listOf(runtimeResult!!.moduleFragment) + compilationCache.values.map { it.moduleFragment }
val result = compile( val result = compile(
@@ -175,7 +175,7 @@ abstract class BasicIrBoxTest(
dependencies, dependencies,
irDependencies) irDependencies)
compilationCache[outputFile.absolutePath.let { it.substring(0, it.length - 2)} + "meta.js"] = result compilationCache[outputFile.name.replace(".js", ".meta.js")] = result
outputFile.write(result.generatedCode) outputFile.write(result.generatedCode)
} }