Merge branch 'develop'

spinach · spinach · commit 01b6d3ce9f06 · 2020-02-24T13:29:10.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.1
+
+- Updated Ktor to `1.3.0`
+
 # 1.2.2
 
 - Fixed a bug for geoDistance when we receive a MAX_ULONG value of 18446744073709551615 from the server #156
diff --git a/buildSrc/src/main/kotlin/Ktor.kt b/buildSrc/src/main/kotlin/Ktor.kt
@@ -2,5 +2,5 @@ object Ktor : Dependency {
 
     override val group = "io.ktor"
     override val artifact = "ktor"
-    override val version = "1.2.6"
+    override val version = "1.3.0"
 }
diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt
@@ -2,5 +2,5 @@ object Library: Dependency {
 
     override val group = "com.algolia"
     override val artifact = "algoliasearch-client-kotlin"
-    override val version = "1.2.2"
+    override val version = "1.3.1"
 }
diff --git a/src/androidMain/kotlin/com/algolia/search/helper/Hashing.kt b/src/androidMain/kotlin/com/algolia/search/helper/Hashing.kt
@@ -1,7 +1,7 @@
 package com.algolia.search.helper
 
 import android.util.Base64
-import kotlinx.io.core.toByteArray
+import io.ktor.utils.io.core.toByteArray
 import kotlinx.serialization.internal.HexConverter
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
diff --git a/src/androidMain/kotlin/com/algolia/search/transport/Gzip.kt b/src/androidMain/kotlin/com/algolia/search/transport/Gzip.kt
@@ -2,7 +2,7 @@ package com.algolia.search.transport
 
 import io.ktor.util.GZip
 import io.ktor.util.toByteArray
-import kotlinx.coroutines.io.ByteReadChannel
+import io.ktor.utils.io.ByteReadChannel
 import kotlinx.coroutines.runBlocking
 
 
diff --git a/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsights.kt b/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsights.kt
@@ -2,7 +2,7 @@ package com.algolia.search.endpoint
 
 import com.algolia.search.model.insights.InsightsEvent
 import com.algolia.search.transport.RequestOptions
-import io.ktor.client.response.HttpResponse
+import io.ktor.client.statement.HttpResponse
 
 
 /**
diff --git a/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsImpl.kt b/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsImpl.kt
@@ -7,7 +7,7 @@ import com.algolia.search.serialize.JsonNoDefaults
 import com.algolia.search.serialize.RouteEventsV1
 import com.algolia.search.transport.RequestOptions
 import com.algolia.search.transport.Transport
-import io.ktor.client.response.HttpResponse
+import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpMethod
 
 
diff --git a/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsUser.kt b/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsUser.kt
@@ -7,7 +7,7 @@ import com.algolia.search.model.filter.Filter
 import com.algolia.search.model.insights.EventName
 import com.algolia.search.model.insights.InsightsEvent
 import com.algolia.search.model.response.ResponseSearch
-import io.ktor.client.response.HttpResponse
+import io.ktor.client.statement.HttpResponse
 
 
 /**
diff --git a/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsUserImpl.kt b/src/commonMain/kotlin/com/algolia/search/endpoint/EndpointInsightsUserImpl.kt
@@ -7,7 +7,7 @@ import com.algolia.search.model.filter.Filter
 import com.algolia.search.model.insights.EventName
 import com.algolia.search.model.insights.InsightsEvent
 import com.algolia.search.model.insights.UserToken
-import io.ktor.client.response.HttpResponse
+import io.ktor.client.statement.HttpResponse
 
 
 class EndpointInsightsUserImpl(
diff --git a/src/commonMain/kotlin/com/algolia/search/helper/ResponseException.kt b/src/commonMain/kotlin/com/algolia/search/helper/ResponseException.kt
@@ -1,8 +1,8 @@
 package com.algolia.search.helper
 
 import io.ktor.client.features.ResponseException
-import io.ktor.client.response.readBytes
-import kotlinx.io.core.String
+import io.ktor.client.statement.readBytes
+import io.ktor.utils.io.core.String
 
 
 /**
diff --git a/src/commonMain/kotlin/com/algolia/search/transport/Transport.kt b/src/commonMain/kotlin/com/algolia/search/transport/Transport.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withTimeout
-import kotlinx.io.IOException
+import io.ktor.utils.io.errors.IOException
 import kotlin.math.floor
 
 
diff --git a/src/commonTest/kotlin/client/TestMockEngine.kt b/src/commonTest/kotlin/client/TestMockEngine.kt
@@ -12,7 +12,7 @@ import io.ktor.client.engine.mock.respond
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
-import kotlinx.coroutines.io.ByteReadChannel
+import io.ktor.utils.io.ByteReadChannel
 import runBlocking
 import shouldEqual
 import kotlin.test.Test
diff --git a/src/commonTest/kotlin/configuration/TestUserAgent.kt b/src/commonTest/kotlin/configuration/TestUserAgent.kt
@@ -14,6 +14,9 @@ import io.ktor.client.engine.mock.respondOk
 import io.ktor.client.features.ResponseException
 import io.ktor.client.features.UserAgent
 import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.request
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.response
 import runBlocking
 import shouldBeTrue
 import shouldEqual
@@ -47,8 +50,8 @@ internal class TestUserAgent {
                     }
                 })
             val client = ClientSearch(configuration)
-            val request = client.httpClient.execute(HttpRequestBuilder())
-            val headers = request.response.call.request.headers
+            val request = client.httpClient.request<HttpResponse>(HttpRequestBuilder())
+            val headers = request.call.request.headers
 
             headers.contains(userAgentKey).shouldBeTrue()
             headers[userAgentKey] shouldEqual clientUserAgent(BuildConfig.version)
diff --git a/src/commonTest/kotlin/documentation/reference/DocPhilosophy.kt b/src/commonTest/kotlin/documentation/reference/DocPhilosophy.kt
@@ -18,7 +18,7 @@ import documentation.index
 import io.ktor.client.features.ResponseException
 import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.*
-import kotlinx.io.IOException
+import io.ktor.utils.io.errors.IOException
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.json
diff --git a/src/commonTest/kotlin/suite/TestSuiteDNS.kt b/src/commonTest/kotlin/suite/TestSuiteDNS.kt
@@ -12,7 +12,7 @@ import io.ktor.client.features.logging.LogLevel
 import io.ktor.http.ContentType
 import io.ktor.http.headersOf
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.io.ByteReadChannel
+import io.ktor.utils.io.ByteReadChannel
 import runBlocking
 import shouldEqual
 import kotlin.test.Test
@@ -29,16 +29,15 @@ internal class TestSuiteDNS {
 
         requestCount++
         delay(delay)
-        content
+        respond(
+            headers = headersOf(
+                "Content-Type",
+                listOf(ContentType.Application.Json.toString())
+            ),
+            content = ByteReadChannel(Json.stringify(ResponseSearch.serializer(), ResponseSearch()))
+        )
     }
 
-    private val content = respond(
-        headers = headersOf(
-            "Content-Type",
-            listOf(ContentType.Application.Json.toString())
-        ),
-        content = ByteReadChannel(Json.stringify(ResponseSearch.serializer(), ResponseSearch()))
-    )
     private val client = ClientSearch(
         ConfigurationSearch(
             clientAdmin1.applicationID,
diff --git a/src/commonTest/kotlin/suite/TestSuiteInsights.kt b/src/commonTest/kotlin/suite/TestSuiteInsights.kt
@@ -12,7 +12,7 @@ import com.algolia.search.model.insights.InsightsEvent
 import com.algolia.search.model.search.Query
 import com.algolia.search.model.task.TaskStatus
 import com.algolia.search.serialize.KeyObjectID
-import io.ktor.client.response.HttpResponse
+import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpStatusCode
 import kotlinx.serialization.json.json
 import runBlocking
diff --git a/src/commonTest/kotlin/suite/TestSuiteMultiCluster.kt b/src/commonTest/kotlin/suite/TestSuiteMultiCluster.kt
@@ -6,12 +6,12 @@ import com.algolia.search.helper.toUserID
 import com.algolia.search.model.multicluster.UserID
 import com.algolia.search.model.multicluster.UserIDQuery
 import io.ktor.client.features.ResponseException
-import io.ktor.client.response.readBytes
+import io.ktor.client.statement.readBytes
 import io.ktor.http.HttpStatusCode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
-import kotlinx.io.core.String
+import io.ktor.utils.io.core.String
 import runBlocking
 import shouldBeFalse
 import shouldBeTrue
diff --git a/src/commonTest/kotlin/suite/TestSuiteSearch.kt b/src/commonTest/kotlin/suite/TestSuiteSearch.kt
@@ -144,7 +144,7 @@ internal class TestSuiteSearch {
             )
 
             search.explainOrNull.shouldNotBeNull()
-            search.explain.match.alternatives.size shouldEqual 11
+            search.explain.match.alternatives.size shouldEqual 13
         }
     }
 }
diff --git a/src/jvmMain/kotlin/com/algolia/search/helper/Hashing.kt b/src/jvmMain/kotlin/com/algolia/search/helper/Hashing.kt
@@ -1,6 +1,6 @@
 package com.algolia.search.helper
 
-import kotlinx.io.core.toByteArray
+import io.ktor.utils.io.core.toByteArray
 import kotlinx.serialization.internal.HexConverter
 import java.util.*
 import javax.crypto.Mac
diff --git a/src/jvmMain/kotlin/com/algolia/search/transport/Gzip.kt b/src/jvmMain/kotlin/com/algolia/search/transport/Gzip.kt
@@ -2,7 +2,7 @@ package com.algolia.search.transport
 
 import io.ktor.util.GZip
 import io.ktor.util.toByteArray
-import kotlinx.coroutines.io.ByteReadChannel
+import io.ktor.utils.io.ByteReadChannel
 import kotlinx.coroutines.runBlocking
 
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +# 1.3.1
++
 +- Updated Ktor to `1.3.0`
++
 # 1.2.2
 - Fixed a bug for geoDistance when we receive a MAX_ULONG value of 18446744073709551615 from the server #156
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ object Ktor : Dependency {`
`2`	`2`
`3`	`3`	`override val group = "io.ktor"`
`4`	`4`	`override val artifact = "ktor"`
`5`		`- override val version = "1.2.6"`
	`5`	`+ override val version = "1.3.0"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ object Library: Dependency {`
`2`	`2`
`3`	`3`	`override val group = "com.algolia"`
`4`	`4`	`override val artifact = "algoliasearch-client-kotlin"`
`5`		`- override val version = "1.2.2"`
	`5`	`+ override val version = "1.3.1"`
`6`	`6`	`}`