From 54bca19de95feff5018a0f6cdee71dbd4d1c3217 Mon Sep 17 00:00:00 2001
From: Oleg Yukhnevich <whyoleg@gmail.com>
Date: Fri, 2 Aug 2024 19:00:10 +0300
Subject: [PATCH] Add `watchosDeviceArm64` target with yaml workaround

---
 buildSrc/src/main/kotlin/NativeUtils.kt            | 4 +++-
 buildSrc/src/main/kotlin/Publication.kt            | 1 +
 ktor-server/ktor-server-core/build.gradle.kts      | 1 -
 ktor-server/ktor-server-test-base/build.gradle.kts | 6 ------
 ktor-server/ktor-server-test-host/build.gradle.kts | 7 +------
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/kotlin/NativeUtils.kt b/buildSrc/src/main/kotlin/NativeUtils.kt
index 7b03284e07e..4391731d62c 100644
--- a/buildSrc/src/main/kotlin/NativeUtils.kt
+++ b/buildSrc/src/main/kotlin/NativeUtils.kt
@@ -33,11 +33,13 @@ fun Project.iosTargets(): List<String> = with(kotlin) {
 }
 
 fun Project.watchosTargets(): List<String> = with(kotlin) {
-    listOf(
+    listOfNotNull(
         watchosX64(),
         watchosArm32(),
         watchosArm64(),
         watchosSimulatorArm64(),
+        // because of dependency on YAML library: https://github.com/Him188/yamlkt/issues/67
+        if (project.name != "ktor-server-config-yaml") watchosDeviceArm64() else null,
     ).map { it.name }
 }
 
diff --git a/buildSrc/src/main/kotlin/Publication.kt b/buildSrc/src/main/kotlin/Publication.kt
index cf848acb3f7..1b62c68b0e7 100644
--- a/buildSrc/src/main/kotlin/Publication.kt
+++ b/buildSrc/src/main/kotlin/Publication.kt
@@ -37,6 +37,7 @@ fun isAvailableForPublication(publication: Publication): Boolean {
         "watchosArm32",
         "watchosArm64",
         "watchosSimulatorArm64",
+        "watchosDeviceArm64",
 
         "tvosX64",
         "tvosArm64",
diff --git a/ktor-server/ktor-server-core/build.gradle.kts b/ktor-server/ktor-server-core/build.gradle.kts
index ffde1e861e6..acf93792f5b 100644
--- a/ktor-server/ktor-server-core/build.gradle.kts
+++ b/ktor-server/ktor-server-core/build.gradle.kts
@@ -43,7 +43,6 @@ kotlin {
                 implementation(project(":ktor-server:ktor-server-config-yaml"))
                 implementation(project(":ktor-server:ktor-server-test-base"))
                 implementation(project(":ktor-server:ktor-server-test-suites"))
-                implementation(project(":ktor-server:ktor-server-config-yaml"))
                 
                 api(libs.logback.classic)
                 implementation(libs.mockk)
diff --git a/ktor-server/ktor-server-test-base/build.gradle.kts b/ktor-server/ktor-server-test-base/build.gradle.kts
index 707a536c85b..890c91ad626 100644
--- a/ktor-server/ktor-server-test-base/build.gradle.kts
+++ b/ktor-server/ktor-server-test-base/build.gradle.kts
@@ -34,10 +34,4 @@ kotlin.sourceSets {
             api(kotlin("test"))
         }
     }
-
-    jvmAndPosixTest {
-        dependencies {
-            api(project(":ktor-server:ktor-server-config-yaml"))
-        }
-    }
 }
diff --git a/ktor-server/ktor-server-test-host/build.gradle.kts b/ktor-server/ktor-server-test-host/build.gradle.kts
index 6a9bde13e46..f25a1283292 100644
--- a/ktor-server/ktor-server-test-host/build.gradle.kts
+++ b/ktor-server/ktor-server-test-host/build.gradle.kts
@@ -37,13 +37,8 @@ kotlin.sourceSets {
     jvmTest {
         dependencies {
             api(project(":ktor-server:ktor-server-core", configuration = "testOutput"))
-            api(kotlin("test"))
-        }
-    }
-
-    jvmAndPosixTest {
-        dependencies {
             api(project(":ktor-server:ktor-server-config-yaml"))
+            api(kotlin("test"))
         }
     }
 }