downgrade ktor to 1.6.8

Author: adamint

build.gradle.kts

@@ -218,7 +218,7 @@ kotlin {
 
         sourceSets {
             val serializationVersion = "1.3.2"
-            val ktorVersion = "2.0.0-beta-1"
+            val ktorVersion = "1.6.8"
             val korlibsVersion = "2.2.0"
             val sparkVersion = "2.9.3"
             val androidSpotifyAuthVersion = "1.2.5"

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApiBuilder.kt

@@ -9,7 +9,7 @@ import com.adamratzman.spotify.models.serialization.nonstrictJson
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.urlEncodeBase64String
 import com.soywiz.krypto.SHA256
-import io.ktor.client.plugins.ServerResponseException
+import io.ktor.client.features.ServerResponseException
 import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CancellationException
 import kotlinx.serialization.json.Json

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyExceptions.kt

@@ -3,7 +3,7 @@ package com.adamratzman.spotify
 
 import com.adamratzman.spotify.models.AuthenticationError
 import com.adamratzman.spotify.models.ErrorObject
-import io.ktor.client.plugins.ResponseException
+import io.ktor.client.features.ResponseException
 
 public sealed class SpotifyException(message: String, cause: Throwable? = null) : Exception(message, cause) {
     public abstract class UnNullableException(message: String) : SpotifyException(message)

src/commonMain/kotlin/com.adamratzman.spotify/http/HttpConnection.kt

@@ -11,14 +11,14 @@ import com.adamratzman.spotify.models.ErrorResponse
 import com.adamratzman.spotify.models.SpotifyRatelimitedException
 import com.adamratzman.spotify.models.serialization.nonstrictJson
 import com.adamratzman.spotify.models.serialization.toObject
+import com.soywiz.korio.dynamic.KDynamic.Companion.toLong
 import io.ktor.client.HttpClient
-import io.ktor.client.plugins.ResponseException
+import io.ktor.client.features.ResponseException
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.header
 import io.ktor.client.request.request
-import io.ktor.client.request.setBody
 import io.ktor.client.request.url
-import io.ktor.client.statement.bodyAsText
+import io.ktor.client.statement.readText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpMethod
 import io.ktor.http.content.ByteArrayContent
@@ -62,21 +62,19 @@ public class HttpConnection constructor(
         url(this@HttpConnection.url)
         method = this@HttpConnection.method.externalMethod
 
-        setBody(
-            when (this@HttpConnection.method) {
-                HttpRequestMethod.DELETE -> {
-                    bodyString.toByteArrayContent() ?: body
-                }
-                HttpRequestMethod.PUT, HttpRequestMethod.POST -> {
-                    val contentString = if (contentType == ContentType.Application.FormUrlEncoded) {
-                        bodyMap?.map { "${it.key}=${it.value}" }?.joinToString("&") ?: bodyString
-                    } else bodyString
+        body = when (this@HttpConnection.method) {
+            HttpRequestMethod.DELETE -> {
+                bodyString.toByteArrayContent() ?: body
+            }
+            HttpRequestMethod.PUT, HttpRequestMethod.POST -> {
+                val contentString = if (contentType == ContentType.Application.FormUrlEncoded) {
+                    bodyMap?.map { "${it.key}=${it.value}" }?.joinToString("&") ?: bodyString
+                } else bodyString
 
-                    contentString.toByteArrayContent() ?: ByteArrayContent("".toByteArray(), contentType)
-                }
-                else -> body
+                contentString.toByteArrayContent() ?: ByteArrayContent("".toByteArray(), contentType)
             }
-        )
+            else -> body
+        }
 
         // let additionalHeaders overwrite headers
         val allHeaders = if (additionalHeaders == null) this@HttpConnection.headers
@@ -94,7 +92,7 @@ public class HttpConnection constructor(
         val httpRequest = buildRequest(additionalHeaders)
         if (api?.spotifyApiOptions?.enableDebugMode == true) println("DEBUG MODE: Request: $this")
         try {
-            return httpClient.request(httpRequest).let { response ->
+            return httpClient.request<io.ktor.client.statement.HttpResponse>(httpRequest).let { response ->
                 val respCode = response.status.value
 
                 if (respCode in 500..599 && (retryIfInternalServerErrorLeft == null || retryIfInternalServerErrorLeft == -1 || retryIfInternalServerErrorLeft > 0)) {
@@ -118,7 +116,7 @@ public class HttpConnection constructor(
                     } else throw SpotifyRatelimitedException(ratelimit)
                 }
 
-                val body: String = response.bodyAsText()
+                val body: String = response.readText()
                 if (api?.spotifyApiOptions?.enableDebugMode == true) println("DEBUG MODE: $body")
 
                 if (respCode == 401 && body.contains("access token") && api?.spotifyApiOptions?.automaticRefresh == true) {
@@ -147,7 +145,7 @@ public class HttpConnection constructor(
         } catch (e: CancellationException) {
             throw e
         } catch (e: ResponseException) {
-            val errorBody = e.response.bodyAsText()
+            val errorBody = e.response.readText()
             if (api?.spotifyApiOptions?.enableDebugMode == true) println("DEBUG MODE: $errorBody")
             try {
                 val respCode = e.response.status.value