Fix windows build (#3264)

* Make fast target faster * Disable curl test task

Fix windows build (#3264)
* Make fast target faster * Disable curl test task
572c1409 · Leonid Stashevsky · GitHub · 0e449d3f · 572c1409 · 572c1409
--- a/buildSrc/src/main/kotlin/IdeUtils.kt
+++ b/buildSrc/src/main/kotlin/IdeUtils.kt
@@ -14,6 +14,7 @@ fun KotlinMultiplatformExtension.ideaTarget(): KotlinNativeTarget = when (HostMa
    else -> error("Unsupported target ${HostManager.host}")
 }

-fun Project.fastTarget() {
+fun Project.fastTarget(): Boolean {
    if (COMMON_JVM_ONLY) kotlin.jvm()
+    return COMMON_JVM_ONLY
 }
--- a/buildSrc/src/main/kotlin/KotlinExtensions.kt
+++ b/buildSrc/src/main/kotlin/KotlinExtensions.kt
@@ -37,6 +37,11 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.jvmAndNixTest(block: KotlinSourc
    block(sourceSet)
 }

+fun NamedDomainObjectContainer<KotlinSourceSet>.nixTest(block: KotlinSourceSet.() -> Unit) {
+    val sourceSet = findByName("nixTest") ?: return
+    block(sourceSet)
+}
+
 fun NamedDomainObjectContainer<KotlinSourceSet>.posixMain(block: KotlinSourceSet.() -> Unit) {
    val sourceSet = findByName("posixMain") ?: return
    block(sourceSet)

--- a/ktor-client/ktor-client-curl/build.gradle.kts
+++ b/ktor-client/ktor-client-curl/build.gradle.kts
@@ -34,7 +34,7 @@ plugins {
 }

 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    createCInterop("libcurl", listOf("macosX64", "linuxX64", "mingwX64")) {
        defFile = File(projectDir, "desktop/interop/libcurl.def")
@@ -61,9 +61,6 @@ kotlin {
        }
    }

-    afterEvaluate {
-        if (HOST_NAME != "windows") return@afterEvaluate
-        val winTests = tasks.findByName("mingwX64Test") as? KotlinNativeTest? ?: return@afterEvaluate
-        winTests.environment("PATH", WIN_LIBRARY_PATH)
-    }
+
+    tasks.findByName("linkDebugTestMingwX64")?.onlyIf { false }
 }
--- a/ktor-client/ktor-client-darwin-legacy/build.gradle.kts
+++ b/ktor-client/ktor-client-darwin-legacy/build.gradle.kts
 apply<test.server.TestServerPlugin>()

 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    sourceSets {
        darwinMain {

--- a/ktor-client/ktor-client-darwin/build.gradle.kts
+++ b/ktor-client/ktor-client-darwin/build.gradle.kts
 apply<test.server.TestServerPlugin>()

 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    sourceSets {
        darwinMain {

--- a/ktor-client/ktor-client-ios/build.gradle.kts
+++ b/ktor-client/ktor-client-ios/build.gradle.kts
 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    sourceSets {
        darwinMain {

--- a/ktor-client/ktor-client-js/build.gradle.kts
+++ b/ktor-client/ktor-client-js/build.gradle.kts
 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    sourceSets {
        jsMain {

--- a/ktor-client/ktor-client-tests/build.gradle.kts
+++ b/ktor-client/ktor-client-tests/build.gradle.kts
@@ -78,7 +78,7 @@ kotlin.sourceSets {
        }
    }

-    desktopTest {
+    nixTest {
        dependencies {
            api(project(":ktor-client:ktor-client-curl"))
        }

--- a/ktor-client/ktor-client-winhttp/build.gradle.kts
+++ b/ktor-client/ktor-client-winhttp/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }

 kotlin {
-    fastTarget()
+    if (fastTarget()) return@kotlin

    createCInterop("winhttp", windowsTargets()) {
        defFile = File(projectDir, "windows/interop/winhttp.def")