Use ktor darwin for mac to avoid curl issue in macOS 14.0

ncipollo · Oct 2, 2023 · f0879aa · f0879aa
1 parent ada6776
commit f0879aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -208,15 +208,22 @@ kotlin {
 
         val desktopMain by creating {
             dependsOn(nativeMain)
+        }
+        val desktopTest by creating { dependsOn(nativeTest) }
+        val linuxX64Main by getting {
+            dependsOn(desktopMain)
             dependencies {
                 implementation(libs.ktor.curl)
             }
         }
-        val desktopTest by creating { dependsOn(nativeTest) }
-        val linuxX64Main by getting { dependsOn(desktopMain) }
         val linuxX64Test by getting { dependsOn(desktopTest) }
 
-        val macosMain by creating { dependsOn(desktopMain) }
+        val macosMain by creating {
+            dependsOn(desktopMain)
+            dependencies {
+                implementation(libs.ktor.darwin)
+            }
+        }
         val macosTest by creating { dependsOn(desktopTest) }
 
         val macosArm64Main by getting { dependsOn(macosMain) }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 ktor-content-negotation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
+ktor-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-ios = { module = "io.ktor:ktor-client-ios", version.ref = "ktor" }
 ktor-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
 ktor-jvm = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }

diff --git a/src/commonTest/kotlin/org/tix/integrations/jira/field/FieldApiTest.kt b/src/commonTest/kotlin/org/tix/integrations/jira/field/FieldApiTest.kt
@@ -2,11 +2,9 @@ package org.tix.integrations.jira.field
 
 import org.tix.fixture.integrations.jiraApi
 import org.tix.test.runTestWorkaround
-import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.expect
 
-@Ignore
 class FieldApiTest {
     private val api = jiraApi().field