From b4486deddafa28cfc441c7cbfa7f69540df89599 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sat, 22 Jan 2022 00:28:07 -0600 Subject: Prepare shared module for iOS support and updated appcompat and constraintlayout libraries --- .../trackermap/TrackerMap/client/infrastructure/ApiClient.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'shared/src/commonMain/kotlin/mx/trackermap/TrackerMap') diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/ApiClient.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/ApiClient.kt index 2ae2b2e..dd61893 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/ApiClient.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/ApiClient.kt @@ -20,7 +20,7 @@ package mx.trackermap.TrackerMap.client.infrastructure import com.russhwolf.settings.Settings import io.ktor.client.* import io.ktor.client.call.* -import io.ktor.client.engine.cio.* +import io.ktor.client.features.* import io.ktor.client.features.json.* import io.ktor.client.features.json.serializer.KotlinxSerializer import io.ktor.client.features.logging.DEFAULT @@ -47,7 +47,11 @@ open class ApiClient( protected const val ApiFormURLType = "application/x-www-form-urlencoded" protected const val ApiXmlMediaType = "application/xml" - val client: HttpClient = HttpClient(CIO) { + val client: HttpClient = HttpClient { + install(HttpTimeout) { + connectTimeoutMillis = 20_000 + requestTimeoutMillis = 20_000 + } install(JsonFeature) { serializer = KotlinxSerializer( KotlinJson { @@ -59,9 +63,6 @@ open class ApiClient( logger = Logger.DEFAULT level = LogLevel.ALL } - engine { - requestTimeout = 20_000 - } } val defaultHeaders: Map = -- cgit v1.2.3