diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt index 0fbdeb0..ddaa49d 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt @@ -14,11 +14,7 @@ import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.infiniteRepeatable import androidx.compose.animation.core.tween -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.LocalIndication -import androidx.compose.foundation.background -import androidx.compose.foundation.gestures.LocalOverScrollConfiguration -import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.* import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.ripple.LocalRippleTheme @@ -126,7 +122,7 @@ class MainActivity : ComponentActivity() { } CompositionLocalProvider( - LocalOverScrollConfiguration provides null, + LocalOverscrollConfiguration provides null, LocalIndication provides rememberRipple(bounded = false), LocalRippleTheme provides rippleTheme, LocalPreferences provides preferences, diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt index df0fc47..bbbd4e1 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt @@ -41,7 +41,7 @@ class Route0( ) : Route(tag) { context(RouteHandlerScope) @Composable - inline operator fun invoke(content: @Composable () -> Unit) { + operator fun invoke(content: @Composable () -> Unit) { if (this == route) { content() } @@ -61,7 +61,7 @@ class Route1( context(RouteHandlerScope) @Composable - inline operator fun invoke(content: @Composable (P0) -> Unit) { + operator fun invoke(content: @Composable (P0) -> Unit) { if (this == route) { if (route is Route1<*>) { @Suppress("UNCHECKED_CAST") @@ -90,7 +90,7 @@ class Route2( context(RouteHandlerScope) @Composable - inline operator fun invoke(content: @Composable (P0, P1) -> Unit) { + operator fun invoke(content: @Composable (P0, P1) -> Unit) { if (this == route) { if (route is Route2<*, *>) { @Suppress("UNCHECKED_CAST") diff --git a/settings.gradle.kts b/settings.gradle.kts index bf53300..f6ecd7d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,14 +11,14 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { - version("kotlin", "1.6.21") + version("kotlin", "1.7.0") alias("kotlin-serialization").toPluginId("org.jetbrains.kotlin.plugin.serialization").versionRef("kotlin") alias("android-media").to("androidx.media", "media").version("1.6.0") - version("compose-compiler", "1.2.0-beta03") + version("compose-compiler", "1.2.0") - version("compose", "1.2.0-beta03") + version("compose", "1.3.0-alpha01") alias("compose-foundation").to("androidx.compose.foundation", "foundation").versionRef("compose") alias("compose-ui").to("androidx.compose.ui", "ui").versionRef("compose") alias("compose-ui-util").to("androidx.compose.ui", "ui-util").versionRef("compose")