Skip to content

Commit 6f57b30

Browse files
committed
fix(android-native): remove cio from android http client paths
1 parent 9f34051 commit 6f57b30

10 files changed

Lines changed: 24 additions & 2 deletions

File tree

acidify-core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ kotlin {
6868
}
6969
findByName("androidNativeArm64Main")?.dependencies {
7070
implementation(project(":android-https-native"))
71-
implementation(libs.ktor.client.cio)
7271
}
7372
all {
7473
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")

yogurt/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ kotlin {
5858
}
5959
findByName("androidNativeArm64Main")?.dependencies {
6060
implementation(project(":android-https-native"))
61-
implementation(libs.ktor.client.cio)
6261
}
6362
}
6463

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal actual fun platformHttpRouteName(): String = "android-native-bridge"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal actual fun platformHttpRouteName(): String = "darwin"

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/Main.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.ntqqrev.yogurt.YogurtApp.config
1111
import org.ntqqrev.yogurt.YogurtApp.t
1212
import org.ntqqrev.yogurt.util.createPlatformHttpClient
1313
import org.ntqqrev.yogurt.util.isCausedByAddrInUse
14+
import org.ntqqrev.yogurt.util.platformHttpRouteName
1415
import org.ntqqrev.yogurt.util.platformHttpsSmokeTestOrNull
1516
import kotlin.jvm.JvmName
1617
import kotlin.time.Duration.Companion.milliseconds
@@ -50,13 +51,15 @@ private fun runHttpsTest(url: String) = runBlocking {
5051
platformHttpsSmokeTestOrNull(url)?.let { response ->
5152
println("HTTPS test ok")
5253
println("URL: $url")
54+
println("Route: ${platformHttpRouteName()} (direct)")
5355
println("Status: ${response.statusCode}")
5456
println("Body: ${response.body.replace("\n", " ").replace("\r", " ").take(200)}")
5557
return@runBlocking
5658
}
5759
} catch (e: Throwable) {
5860
println("HTTPS test failed")
5961
println("URL: $url")
62+
println("Route: ${platformHttpRouteName()} (direct)")
6063
println("Error: ${e::class.simpleName}: ${e.message}")
6164
halt(1)
6265
}
@@ -67,11 +70,13 @@ private fun runHttpsTest(url: String) = runBlocking {
6770
val bodyPreview = response.bodyAsText().replace("\n", " ").replace("\r", " ").take(200)
6871
println("HTTPS test ok")
6972
println("URL: $url")
73+
println("Route: ${platformHttpRouteName()} (ktor)")
7074
println("Status: ${response.status}")
7175
println("Body: $bodyPreview")
7276
} catch (e: Throwable) {
7377
println("HTTPS test failed")
7478
println("URL: $url")
79+
println("Route: ${platformHttpRouteName()} (ktor)")
7580
println("Error: ${e::class.simpleName}: ${e.message}")
7681
halt(1)
7782
} finally {

yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/YogurtApp.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ object YogurtApp {
6262
Commit Hash: ${BuildKonfig.commitHash}
6363
Core Version: ${BuildKonfig.coreVersion}
6464
Milky Version: ${BuildKonfig.milkyVersion} ($milkyVersion)
65+
HTTP Route: ${platformHttpRouteName()}
6566
Build Time: ${BuildKonfig.buildTime}
6667
Listen Address: ${config.milky.http.host}:${config.milky.http.port}${config.milky.http.prefix}
6768
Data Directory: ${withFs { resolve(Path(".")) }}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal expect fun platformHttpRouteName(): String
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal actual fun platformHttpRouteName(): String = "java"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal actual fun platformHttpRouteName(): String = "curl"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package org.ntqqrev.yogurt.util
2+
3+
internal actual fun platformHttpRouteName(): String = "winhttp"

0 commit comments

Comments
 (0)