[build][kotlin-native][test] fix dist dependencies for test targets

This commit is contained in:
Vasily Levchenko
2021-05-10 16:35:04 +02:00
committed by Space
parent 640d263ae1
commit c2a46baa77
3 changed files with 4 additions and 2 deletions
@@ -88,6 +88,7 @@ abstract class KonanTest : DefaultTask(), KonanTestExecutable {
@Suppress("UnstableApiUsage")
override fun configure(config: Closure<*>): Task {
super.configure(config)
dependsOnDist()
// Set Gradle properties for the better navigation
group = LifecycleBasePlugin.VERIFICATION_GROUP
@@ -59,7 +59,7 @@ val Project.platformManager
get() = findProperty("platformManager") as PlatformManager
val Project.testTarget
get() = findProperty("target") as KonanTarget
get() = findProperty("target") as? KonanTarget ?: HostManager.host
val Project.testTargetSuffix
get() = (findProperty("target") as KonanTarget).name.capitalize()
@@ -23,6 +23,7 @@ import org.gradle.api.tasks.TaskAction
import org.jetbrains.kotlin.gradle.plugin.konan.*
import org.jetbrains.kotlin.konan.target.KonanTarget
import java.io.File
import org.jetbrains.kotlin.dependsOnDist
/** Base class for both interop and compiler tasks. */
abstract class KonanBuildingTask: KonanArtifactWithLibrariesTask(), KonanBuildingSpec {
@@ -31,7 +32,7 @@ abstract class KonanBuildingTask: KonanArtifactWithLibrariesTask(), KonanBuildin
internal abstract val toolRunner: KonanToolRunner
override fun init(config: KonanBuildingConfig<*>, destinationDir: File, artifactName: String, target: KonanTarget) {
dependsOn(project.konanCompilerDownloadTask)
dependsOnDist()
super.init(config, destinationDir, artifactName, target)
}