From d9332465e31a2c1c4f94292c6fffdb94902001a5 Mon Sep 17 00:00:00 2001 From: Ivan Matkov Date: Fri, 30 Aug 2024 16:47:53 +0200 Subject: [PATCH] Move `SavedStateHandle.toRoute` to common --- .../navigation-common/api/desktop/navigation-common.api | 4 ++++ .../kotlin/androidx/navigation/SavedStateHandle.kt} | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) rename navigation/navigation-common/src/{androidMain/kotlin/androidx/navigation/SavedStateHandle.android.kt => commonMain/kotlin/androidx/navigation/SavedStateHandle.kt} (98%) diff --git a/navigation/navigation-common/api/desktop/navigation-common.api b/navigation/navigation-common/api/desktop/navigation-common.api index a9617b9bb8a85..7bc905c8ca801 100644 --- a/navigation/navigation-common/api/desktop/navigation-common.api +++ b/navigation/navigation-common/api/desktop/navigation-common.api @@ -433,6 +433,10 @@ public final class androidx/navigation/PopUpToBuilder { public final fun setSaveState (Z)V } +public final class androidx/navigation/SavedStateHandleKt { + public static final fun internalToRoute (Landroidx/lifecycle/SavedStateHandle;Lkotlin/reflect/KClass;Ljava/util/Map;)Ljava/lang/Object; +} + public final class androidx/navigation/serialization/RouteDeserializerKt { public static final fun decodeArguments (Lkotlinx/serialization/KSerializer;Landroidx/core/bundle/Bundle;Ljava/util/Map;)Ljava/lang/Object; public static final fun decodeArguments (Lkotlinx/serialization/KSerializer;Landroidx/lifecycle/SavedStateHandle;Ljava/util/Map;)Ljava/lang/Object; diff --git a/navigation/navigation-common/src/androidMain/kotlin/androidx/navigation/SavedStateHandle.android.kt b/navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/SavedStateHandle.kt similarity index 98% rename from navigation/navigation-common/src/androidMain/kotlin/androidx/navigation/SavedStateHandle.android.kt rename to navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/SavedStateHandle.kt index a8a2a8bb7b3c0..ad19215188945 100644 --- a/navigation/navigation-common/src/androidMain/kotlin/androidx/navigation/SavedStateHandle.android.kt +++ b/navigation/navigation-common/src/commonMain/kotlin/androidx/navigation/SavedStateHandle.kt @@ -14,14 +14,13 @@ * limitations under the License. */ -@file:JvmName("SavedStateHandleKt") - package androidx.navigation import androidx.annotation.RestrictTo import androidx.lifecycle.SavedStateHandle import androidx.navigation.serialization.decodeArguments import androidx.navigation.serialization.generateNavArguments +import kotlin.jvm.JvmSuppressWildcards import kotlin.reflect.KClass import kotlin.reflect.KType import kotlinx.serialization.InternalSerializationApi