Merge branch 'refs/heads/main' into wasm

kittinunf · Jun 16, 2024 · 052672d · 052672d
2 parents a3cc1b7 + e047276
commit 052672d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/fuel-kotlinx-serialization/src/appleMain/kotlin/fuel/serialization/ResponseExtensions.kt b/fuel-kotlinx-serialization/src/appleMain/kotlin/fuel/serialization/ResponseExtensions.kt
@@ -6,8 +6,8 @@ import fuel.HttpResponse
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.Json
 
-public fun <T : Any> HttpResponse.toJson(
-    json: Json = Json { allowStructuredMapKeys = true },
+public actual fun <T : Any> HttpResponse.toJson(
+    json: Json,
     deserializationStrategy: DeserializationStrategy<T>
 ): Result<T?, Throwable> = runCatching {
     body?.let { json.decodeFromString(deserializationStrategy, it) }

diff --git a/fuel-kotlinx-serialization/src/commonMain/kotlin/fuel/serialization/ResponseExtensions.kt b/fuel-kotlinx-serialization/src/commonMain/kotlin/fuel/serialization/ResponseExtensions.kt
@@ -0,0 +1,11 @@
+package fuel.serialization
+
+import com.github.kittinunf.result.Result
+import fuel.HttpResponse
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.json.Json
+
+public expect fun <T : Any> HttpResponse.toJson(
+    json: Json = Json,
+    deserializationStrategy: DeserializationStrategy<T>
+): Result<T?, Throwable>
diff --git a/fuel-kotlinx-serialization/src/jvmMain/kotlin/fuel/serialization/ResponseExtensions.kt b/fuel-kotlinx-serialization/src/jvmMain/kotlin/fuel/serialization/ResponseExtensions.kt
@@ -6,8 +6,8 @@ import fuel.HttpResponse
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.Json
 
-public fun <T : Any> HttpResponse.toJson(
-    json: Json = Json { allowStructuredMapKeys = true },
+public actual fun <T : Any> HttpResponse.toJson(
+    json: Json,
     deserializationStrategy: DeserializationStrategy<T>
 ): Result<T?, Throwable> = runCatching {
     json.decodeFromString(deserializationStrategy, body.string())

diff --git a/fuel-kotlinx-serialization/src/wasmJsMain/kotlin/fuel/serialization/ResponseExtensions.kt b/fuel-kotlinx-serialization/src/wasmJsMain/kotlin/fuel/serialization/ResponseExtensions.kt
@@ -6,8 +6,8 @@ import fuel.HttpResponse
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.json.Json
 
-public fun <T : Any> HttpResponse.toJson(
-    json: Json = Json { allowStructuredMapKeys = true },
+public actual fun <T : Any> HttpResponse.toJson(
+    json: Json,
     deserializationStrategy: DeserializationStrategy<T>
 ): Result<T?, Throwable> = runCatching {
     json.decodeFromString(deserializationStrategy, response?.json().toString())

diff --git a/gradle.properties b/gradle.properties
@@ -11,5 +11,5 @@ artifactUrl=https://github.com/kittinunf/fuel
 artifactScm=git@github.com:kittinunf/fuel.git
 artifactLicenseName=MIT License
 artifactLicenseUrl=http://www.opensource.org/licenses/mit-license.php
-artifactPublishVersion=3.0.0-alpha02
+artifactPublishVersion=3.0.0-alpha03
 artifactGroupId=com.github.kittinunf.fuel