revert default ktor engine

qdsfdhvh · Nov 14, 2023 · 81c68ae · 81c68ae
1 parent b5b32ab
commit 81c68ae
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/image-loader/build.gradle.kts b/image-loader/build.gradle.kts
@@ -36,6 +36,11 @@ kotlin {
                 implementation(compose.ui)
             }
         }
+        jvmMain {
+            dependencies {
+                implementation(libs.ktor.client.okhttp)
+            }
+        }
         androidMain {
             dependencies {
                 implementation(libs.kotlinx.coroutines.android)
@@ -69,6 +74,16 @@ kotlin {
                 }
             }
         }
+        appleMain {
+            dependencies {
+                implementation(libs.ktor.client.darwin)
+            }
+        }
+        jsMain {
+            dependencies {
+                implementation(libs.ktor.client.js)
+            }
+        }
         val noJsMain by creating {
             dependsOn(commonMain.get())
             jvmMain.get().dependsOn(this)

diff --git a/image-loader/src/appleMain/kotlin/com/seiko/imageloader/util/Platform.apple.kt b/image-loader/src/appleMain/kotlin/com/seiko/imageloader/util/Platform.apple.kt
@@ -1,7 +1,11 @@
 package com.seiko.imageloader.util
 
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.darwin.Darwin
 import okio.FileSystem
 
 actual typealias WeakReference<T> = kotlin.native.ref.WeakReference<T>
 
+internal actual val httpEngine: HttpClientEngine get() = Darwin.create()
+
 internal actual val defaultFileSystem: FileSystem? get() = FileSystem.SYSTEM
diff --git a/image-loader/src/commonMain/kotlin/com/seiko/imageloader/util/Platform.kt b/image-loader/src/commonMain/kotlin/com/seiko/imageloader/util/Platform.kt
@@ -1,6 +1,7 @@
 package com.seiko.imageloader.util
 
 import io.ktor.client.HttpClient
+import io.ktor.client.engine.HttpClientEngine
 import io.ktor.utils.io.ByteReadChannel
 import kotlinx.coroutines.CoroutineDispatcher
 import okio.BufferedSource
@@ -16,7 +17,9 @@ internal expect suspend fun ByteReadChannel.source(): BufferedSource
 
 internal expect val ioDispatcher: CoroutineDispatcher
 
+internal expect val httpEngine: HttpClientEngine
+
 internal expect val defaultFileSystem: FileSystem?
 
 internal val httpEngineFactory: () -> HttpClient
-    get() = { HttpClient() }
+    get() = { HttpClient(httpEngine) }
diff --git a/image-loader/src/jsMain/kotlin/com/seiko/imageloader/util/Platform.js.kt b/image-loader/src/jsMain/kotlin/com/seiko/imageloader/util/Platform.js.kt
@@ -1,5 +1,7 @@
 package com.seiko.imageloader.util
 
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.js.Js
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import okio.FileSystem
@@ -28,4 +30,6 @@ actual class WeakReference<T : Any> actual constructor(referred: T) {
 
 internal actual val ioDispatcher: CoroutineDispatcher get() = Dispatchers.Default
 
+internal actual val httpEngine: HttpClientEngine get() = Js.create()
+
 internal actual val defaultFileSystem: FileSystem? get() = null
diff --git a/image-loader/src/jvmMain/kotlin/com/seiko/imageloader/util/Platform.jvm.kt b/image-loader/src/jvmMain/kotlin/com/seiko/imageloader/util/Platform.jvm.kt
@@ -1,5 +1,7 @@
 package com.seiko.imageloader.util
 
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.jvm.javaio.toInputStream
 import okio.BufferedSource
@@ -13,6 +15,8 @@ internal actual suspend fun ByteReadChannel.source(): BufferedSource {
     return toInputStream().source().buffer()
 }
 
+internal actual val httpEngine: HttpClientEngine get() = OkHttp.create()
+
 internal actual val defaultFileSystem: FileSystem? get() = FileSystem.SYSTEM
 
 internal expect fun getMimeTypeFromExtension(extension: String): String?