From 20871c841ad7c318821d96d2c0fbadf9d8981eb6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 19:46:08 +0000 Subject: [PATCH 1/2] Update kotlinx.serialization to v1.6.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98cf66a952..adcc234282 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ compileSdk = "34" http4k = "4.48.0.0" kotlin = "1.9.0" kotlinx-coroutines = "1.7.3" -kotlinx-serialization = "1.5.1" +kotlinx-serialization = "1.6.0" okHttp = "4.11.0" okio = "3.5.0" minSdk = "18" From a7d7348f8b9b2258be2d8a831a9c3c233f321c8f Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 23 Aug 2023 10:00:27 -0400 Subject: [PATCH 2/2] Fix paths --- .../kotlin/app/cash/zipline/testing/IoTestingCommon.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zipline-testing/src/hostMain/kotlin/app/cash/zipline/testing/IoTestingCommon.kt b/zipline-testing/src/hostMain/kotlin/app/cash/zipline/testing/IoTestingCommon.kt index b67b6a4e98..5954d753a6 100644 --- a/zipline-testing/src/hostMain/kotlin/app/cash/zipline/testing/IoTestingCommon.kt +++ b/zipline-testing/src/hostMain/kotlin/app/cash/zipline/testing/IoTestingCommon.kt @@ -41,8 +41,8 @@ fun Zipline.loadTestingJs() { // Load modules in topologically-sorted order. In production the zipline-manifest does this. loadJsModuleFromResource("./kotlin-kotlin-stdlib-js-ir.js") loadJsModuleFromResource("./88b0986a7186d029-atomicfu-js-ir.js") - loadJsModuleFromResource("./kotlinx-serialization-kotlinx-serialization-core-js-ir.js") - loadJsModuleFromResource("./kotlinx-serialization-kotlinx-serialization-json-js-ir.js") + loadJsModuleFromResource("./kotlinx-serialization-kotlinx-serialization-core.js") + loadJsModuleFromResource("./kotlinx-serialization-kotlinx-serialization-json.js") loadJsModuleFromResource("./kotlinx.coroutines-kotlinx-coroutines-core-js-ir.js") loadJsModuleFromResource("./zipline-root-zipline.js") loadJsModuleFromResource("./zipline-root-zipline-testing.js")