Ktor Parsing Error Fix and Bump to v3.6.1

.github/workflows/build-release-binaries.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           draft: true
           allowUpdates: true
-          tag: "v3.6.0"
+          tag: "v3.6.1"
           artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*"
           token: ${{ secrets.GH_TOKEN }}
 
@@ -81,7 +81,7 @@ jobs:
         with:
           draft: true
           allowUpdates: true
-          tag: "v3.6.0"
+          tag: "v3.6.1"
           artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*,android/build/outputs/apk/release/*signed.apk"
           token: ${{ secrets.GH_TOKEN }}
 
@@ -114,6 +114,6 @@ jobs:
         with:
           draft: true
           allowUpdates: true
-          tag: "v3.6.0"
+          tag: "v3.6.1"
           artifacts: "desktop/build/compose/jars/*.jar,desktop/build/compose/binaries/main/*/*"
           token: ${{ secrets.GH_TOKEN }}

buildSrc/buildSrc/src/main/kotlin/Versions.kt

@@ -26,9 +26,9 @@ import org.gradle.kotlin.dsl.getByType
 
 object Versions {
     // App's Version (To be bumped at each update)
-    const val versionName = "3.6.0"
+    const val versionName = "3.6.1"
 
-    const val versionCode = 28
+    const val versionCode = 29
 
     // Android
     const val minSdkVersion = 21

buildSrc/deps.versions.toml

@@ -25,6 +25,7 @@ androidxLifecycle = "2.4.0-alpha03"
 [libraries]
 kotlin-kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serialization = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 kotlin-kotlinTestCommon = { group = "org.jetbrains.kotlin", name = "kotlin-test-common", version.ref = "kotlin" }
 kotlin-kotlinTestJs = { group = "org.jetbrains.kotlin", name = "kotlin-test-js", version.ref = "kotlin" }
 kotlin-kotlinTestJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }

common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/utils/NetworkingExt.kt

@@ -43,32 +43,30 @@ suspend inline fun HttpClient.getFinalUrl(
     }
 }
 
-fun createHttpClient(enableNetworkLogs: Boolean = false) = HttpClient {
+fun createHttpClient(enableNetworkLogs: Boolean = false) = buildHttpClient {
-    buildHttpClient {
+    // https://github.com/Kotlin/kotlinx.serialization/issues/1450
-        // https://github.com/Kotlin/kotlinx.serialization/issues/1450
+    install(JsonFeature) {
-        install(JsonFeature) {
+        serializer = KotlinxSerializer(globalJson)
-            serializer = KotlinxSerializer(globalJson)
+    }
-        }
+    install(HttpTimeout) {
-        install(HttpTimeout) {
+        socketTimeoutMillis = 520_000
-            socketTimeoutMillis = 520_000
+        requestTimeoutMillis = 360_000
-            requestTimeoutMillis = 360_000
+        connectTimeoutMillis = 360_000
-            connectTimeoutMillis = 360_000
+    }
-        }
+    // WorkAround for Freezing
-        // WorkAround for Freezing
+    // Use httpClient.getData / httpClient.postData Extensions
-        // Use httpClient.getData / httpClient.postData Extensions
+    /*install(JsonFeature) {
-        /*install(JsonFeature) {
+        serializer = KotlinxSerializer(
-            serializer = KotlinxSerializer(
+            Json {
-                Json {
+                isLenient = true
-                    isLenient = true
+                ignoreUnknownKeys = true
-                    ignoreUnknownKeys = true
-                }
-            )
-        }*/
-        if (enableNetworkLogs) {
-            install(Logging) {
-                logger = Logger.DEFAULT
-                level = LogLevel.INFO
             }
+        )
+    }*/
+    if (enableNetworkLogs) {
+        install(Logging) {
+            logger = Logger.DEFAULT
+            level = LogLevel.INFO
         }
     }
 }
@@ -77,4 +75,4 @@ expect fun buildHttpClient(extraConfig: HttpClientConfig<*>.() -> Unit): HttpCli
 
 /*Client Active Throughout App's Lifetime*/
 @SharedImmutable
-val ktorHttpClient = HttpClient {}
+private val ktorHttpClient = HttpClient {}

common/providers/src/commonMain/kotlin/com.shabinder.common.providers/sound_cloud/requests/SoundCloudRequests.kt

@@ -152,17 +152,15 @@ interface SoundCloudRequests {
 suspend inline fun <reified T : Any> SoundCloudRequests.doAuthenticatedRequest(url: String): T {
     var clientID: String = SoundCloudRequests.CLIENT_ID
     return try {
-        val data: String = httpClient.get(url) {
+        httpClient.get(url) {
             parameter("client_id", clientID)
         }
-        globalJson.decodeFromString(data)
     } catch (e: ClientRequestException) {
         if (clientID != SoundCloudRequests.ALT_CLIENT_ID) {
             clientID = SoundCloudRequests.ALT_CLIENT_ID
-            val data: String = httpClient.get(url) {
+            return httpClient.get(url) {
                 parameter("client_id", clientID)
             }
-            return globalJson.decodeFromString(data)
         }
         throw e
     }

common/providers/src/commonMain/kotlin/com.shabinder.common.providers/youtube_music/YoutubeMusic.kt

@@ -34,9 +34,11 @@ import com.shabinder.common.providers.youtube_to_mp3.requests.YoutubeMp3
 import com.shabinder.common.utils.appendPadded
 import io.github.shabinder.fuzzywuzzy.diffutils.FuzzySearch
 import io.ktor.client.HttpClient
+import io.ktor.client.request.header
 import io.ktor.client.request.headers
 import io.ktor.client.request.post
 import io.ktor.http.ContentType
+import io.ktor.http.HttpHeaders
 import io.ktor.http.contentType
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
@@ -357,8 +359,8 @@ class YoutubeMusic constructor(
     private suspend fun getYoutubeMusicResponse(query: String): SuspendableEvent<String, Throwable> =
         SuspendableEvent {
             httpClient.post("${corsApi}https://music.youtube.com/youtubei/v1/search?alt=json&key=$apiKey") {
-                contentType(ContentType.Application.Json)
                 headers {
+                    append(HttpHeaders.ContentType, ContentType.Application.Json.toString())
                     append("referer", "https://music.youtube.com/search")
                 }
                 body = buildJsonObject {

fastlane/metadata/android/en-US/changelogs/29.txt

@@ -0,0 +1 @@
+ - Fixed Response Parsing Error which leaded download failure.