From 5ce64ac7ff05984d55a23f5c4edbde57ebc601f8 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 12 Feb 2023 14:50:41 -0500 Subject: [PATCH] Update Cascade Also clean up kotlinx.serialization versioning --- gradle/kotlinx.versions.toml | 7 ++++--- gradle/libs.versions.toml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml index 0a4959ecda..596410bfd3 100644 --- a/gradle/kotlinx.versions.toml +++ b/gradle/kotlinx.versions.toml @@ -1,5 +1,6 @@ [versions] kotlin_version = "1.8.10" +# TODO: 1.4.1 introduces an issue with cached serializers; see https://github.com/Kotlin/kotlinx.serialization/issues/2065 serialization_version = "1.4.0" xml_serialization_version = "0.84.3" @@ -11,10 +12,10 @@ coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", vers coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" } -# TODO: 1.4.1 introduces an issue with cached serializers; see https://github.com/Kotlin/kotlinx.serialization/issues/2065 -serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.4.0" } -serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version = "1.4.0" } +serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" } +serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization_version" } serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" } + serialization-xml-core = { module = "io.github.pdvrieze.xmlutil:core-android", version.ref = "xml_serialization_version" } serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-android", version.ref = "xml_serialization_version" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5849a33a00..b2e9d02342 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,7 @@ flexible-adapter-ui = "com.github.arkon.FlexibleAdapter:flexible-adapter-ui:c801 photoview = "com.github.chrisbanes:PhotoView:2.3.0" directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0" insetter = "dev.chrisbanes.insetter:insetter:0.6.1" -cascade = "me.saket.cascade:cascade-compose:2.0.0-beta1" +cascade = "me.saket.cascade:cascade-compose:2.0.0-rc01" wheelpicker = "com.github.commandiron:WheelPickerCompose:1.0.11" materialmotion-core = "io.github.fornewid:material-motion-compose-core:0.10.4"