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

[K/N][test] Don't rebuild platform libs in non default dist if exist

Browse Source
This commit is contained in:
Pavel Punegov
2022-02-01 12:33:49 +03:00
committed by Space
parent e544c404b9
commit 74cf792b41
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+12 -10
View File
@@ -116,18 +116,20 @@ fun File.dependencies() =
fun Task.dependsOnPlatformLibs() { fun Task.dependsOnPlatformLibs() {
(this as? KonanTest)?.run { if (!project.hasPlatformLibs) {
project.file(source).dependencies().forEach { (this as? KonanTest)?.run {
this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it") project.file(source).dependencies().forEach {
//this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-${it}Cache")
}
if (this is KonanLinkTest) {
project.file(lib).dependencies().forEach {
this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it") this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it")
//this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-${it}Cache")
} }
} if (this is KonanLinkTest) {
this.dependsOnDist() project.file(lib).dependencies().forEach {
} ?: error("unsupported task : $this") this.dependsOn(":kotlin-native:platformLibs:${project.testTarget.name}-$it")
}
}
this.dependsOnDist()
} ?: error("unsupported task : $this")
}
} }
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")