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

[native-gradle-plugin] Fixed problem with rebuilding caches

Browse Source
This commit is contained in:
Igor Chevdar
2020-06-09 16:15:33 +05:00
parent bc979a33f7
commit 79af726872
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+4 -1
View File
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER
import org.jetbrains.kotlin.konan.properties.saveToFile import org.jetbrains.kotlin.konan.properties.saveToFile
import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.CompilerOutputKind.* import org.jetbrains.kotlin.konan.target.CompilerOutputKind.*
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.*
import java.io.File import java.io.File
@@ -790,7 +791,9 @@ internal class CacheBuilder(val project: Project, val binary: NativeBinary) {
} }
private fun ensureCompilerProvidedLibsPrecached() { private fun ensureCompilerProvidedLibsPrecached() {
val platformLibs = libraries.filter { it.providedByCompiler(project) }.associateBy { it.name } val distribution = Distribution(project.konanHome)
val platformLibs = (listOf(File(distribution.stdlib)) + File(distribution.platformLibs(compilation.konanTarget))
.listFiles()).associateBy { it.name }
val visitedLibs = mutableSetOf<String>() val visitedLibs = mutableSetOf<String>()
for (platformLibName in platformLibs.keys) for (platformLibName in platformLibs.keys)
ensureCompilerProvidedLibPrecached(platformLibName, platformLibs, visitedLibs) ensureCompilerProvidedLibPrecached(platformLibName, platformLibs, visitedLibs)