From 2753804652af8f12fc18d2ee3a7f62acf3b1e6d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 02:41:56 +0000 Subject: [PATCH] Update dependency androidx.compose:compose-bom-alpha to v2025.06.01 (#2434) * Update dependency androidx.compose:compose-bom-alpha to v2025.06.01 * Fix build --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FooIbar <118464521+FooIbar@users.noreply.github.com> --- .../com/hippo/ehviewer/ui/screen/DownloadsScreen.kt | 2 +- .../main/kotlin/com/hippo/ehviewer/ui/tools/State.kt | 12 ------------ gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index 63ba50d41..194baa01a 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -64,6 +64,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.saveable.rememberSerializable import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Alignment @@ -118,7 +119,6 @@ import com.hippo.ehviewer.ui.tools.awaitSelectItemWithCheckBox import com.hippo.ehviewer.ui.tools.awaitSingleChoice import com.hippo.ehviewer.ui.tools.rememberHapticFeedback import com.hippo.ehviewer.ui.tools.rememberInVM -import com.hippo.ehviewer.ui.tools.rememberSerializable import com.hippo.ehviewer.ui.tools.thenIf import com.hippo.ehviewer.util.mapToLongArray import com.hippo.ehviewer.util.takeAndClear diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/State.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/State.kt index c83a56697..aacfbef6e 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/State.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/State.kt @@ -5,12 +5,8 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import androidx.savedstate.serialization.SavedStateConfiguration import kotlin.reflect.KMutableProperty0 -import kotlinx.serialization.KSerializer -import kotlinx.serialization.serializer val KMutableProperty0.observed: MutableState @Composable @@ -33,11 +29,3 @@ val MutableState.rememberedAccessor: KMutableProperty0 var value by this@rememberedAccessor }::value } - -@Composable -inline fun rememberSerializable( - vararg inputs: Any?, - stateSerializer: KSerializer = serializer(), - configuration: SavedStateConfiguration = SavedStateConfiguration.DEFAULT, - noinline init: () -> MutableState, -) = rememberSaveable(inputs = inputs, stateSerializer, configuration, init) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 49857c819..9795b6d4f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ androidx-room = "2.7.2" androidx-work = "2.10.2" arrow = "2.1.2" coil = "3.2.0" -compose-bom = "2025.06.00" +compose-bom = "2025.06.01" compose-destinations = "2.2.0" kotlin = "2.2.0" kotlinx-coroutines = "1.10.2"