From bd89c8dcf2e9094691742f8796a2dab0ae379b6d Mon Sep 17 00:00:00 2001 From: xxfast Date: Mon, 25 Nov 2024 10:54:50 +1100 Subject: [PATCH] Bump dependencies --- .../github/xxfast/decompose/router/pages/RoutedContent.kt | 7 ++----- gradle/libs.versions.toml | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/decompose-router/src/commonMain/kotlin/io/github/xxfast/decompose/router/pages/RoutedContent.kt b/decompose-router/src/commonMain/kotlin/io/github/xxfast/decompose/router/pages/RoutedContent.kt index d1804bb..493570f 100644 --- a/decompose-router/src/commonMain/kotlin/io/github/xxfast/decompose/router/pages/RoutedContent.kt +++ b/decompose-router/src/commonMain/kotlin/io/github/xxfast/decompose/router/pages/RoutedContent.kt @@ -1,20 +1,17 @@ package io.github.xxfast.decompose.router.pages -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.pager.PagerScope import androidx.compose.foundation.pager.PagerState import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier -import com.arkivanov.decompose.ExperimentalDecomposeApi -import com.arkivanov.decompose.extensions.compose.pages.Pages +import com.arkivanov.decompose.extensions.compose.pages.ChildPages import com.arkivanov.decompose.extensions.compose.pages.PagesScrollAnimation import com.arkivanov.decompose.extensions.compose.pages.defaultHorizontalPager import com.arkivanov.decompose.router.pages.select import io.github.xxfast.decompose.router.LocalRouterContext import kotlinx.serialization.Serializable -@OptIn(ExperimentalFoundationApi::class, ExperimentalDecomposeApi::class) @Composable fun RoutedContent( router: Router, @@ -28,7 +25,7 @@ fun RoutedContent( ) -> Unit = defaultHorizontalPager(), content: @Composable (C) -> Unit, ) { - Pages( + ChildPages( pages = router.pages.value, onPageSelected = { index -> router.select(index) }, modifier = modifier, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4dcc5fa..0b29a79 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,13 +2,13 @@ agp = "8.3.2" androidx-activity ="1.7.2" androidx-fragment ="1.6.1" -compose-multiplatform = "1.6.10" +compose-multiplatform = "1.7.0" compose-test-rule = "1.5.1" -decompose = "3.0.0" +decompose = "3.2.2" dokka = "1.8.20" binary-compatibility-validator = "0.13.2" horologist = "0.5.7" -kotlin = "2.0.0" +kotlin = "2.0.20" kotlinx-coroutines = "1.8.0" kotlinx-serialization = "1.6.3" wear-compose = "1.3.0-alpha03"