build: Updated deps

Lastaapps · Jan 15, 2025 · 0548e60 · 0548e60
1 parent d40c60e
commit 0548e60
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 102 deletions.
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/widgets/AgataWalletButton.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/widgets/AgataWalletButton.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -184,7 +184,7 @@ private fun ColumnScope.ButtonContent(
         }
 
         TooltipBox(
-            positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+            positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
             tooltip = {
                 PlainTooltip {
                     Text(text = stringResource(id = R.string.wallet_web))
@@ -201,7 +201,7 @@ private fun ColumnScope.ButtonContent(
         }
 
         TooltipBox(
-            positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+            positionProvider = TooltipDefaults.rememberTooltipPositionProvider(),
             tooltip = {
                 PlainTooltip {
                     Text(text = stringResource(id = R.string.wallet_logout))

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/widget/TodayDishCarousel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/widget/TodayDishCarousel.kt
@@ -166,8 +166,8 @@ private fun DishContent(
                 DishHeader(
                     courseType = category,
                     modifier =
-                    Modifier
-                        .padding(bottom = Padding.Smaller),
+                        Modifier
+                            .padding(bottom = Padding.Smaller),
 //                                .animateItem(),
                 )
             }
@@ -177,8 +177,8 @@ private fun DishContent(
                     Box(
                         contentAlignment = Alignment.Center,
                         modifier =
-                        Modifier
-                            .fillMaxWidth(),
+                            Modifier
+                                .fillMaxWidth(),
 //                                    .animateItem(),
                     ) {
                         DishItem(
@@ -188,8 +188,8 @@ private fun DishContent(
                             appSettings = appSettings,
                             isOnMetered = isOnMetered,
                             modifier =
-                            Modifier
-                                .height(preferredItemSize),
+                                Modifier
+                                    .height(preferredItemSize),
                         )
                     }
                     return@item
@@ -215,7 +215,7 @@ private fun DishContent(
                     // even if progress is called multiple times
                     val progress by remember {
                         derivedStateOf {
-                            carouselItemInfo.let {
+                            carouselItemDrawInfo.let {
                                 // breakpoints
                                 val visible = 0.9f
                                 val hidden = 0.5f

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/components/draggablelazylist/DraggableLazyList.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/components/draggablelazylist/DraggableLazyList.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -19,12 +19,14 @@
 
 package cz.lastaapps.menza.ui.components.draggablelazylist
 
+import androidx.compose.foundation.OverscrollEffect
 import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.rememberOverscrollEffect
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -42,6 +44,7 @@ fun DraggableLazyColumn(
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
     userScrollEnabled: Boolean = true,
+    overscrollEffect: OverscrollEffect? = rememberOverscrollEffect(),
     content: LazyListScope.() -> Unit,
 ) {
     val scope = rememberCoroutineScope()
@@ -54,6 +57,7 @@ fun DraggableLazyColumn(
         horizontalAlignment,
         flingBehavior,
         userScrollEnabled,
+        overscrollEffect,
         content,
     )
 }
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/util/AnimationScopes.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/util/AnimationScopes.kt
@@ -141,9 +141,8 @@ fun Modifier.sharedElement(
     zIndexInOverlay: Float = 0f,
 ): Modifier =
     with(scopes.sharedTransitionScope) {
-        this@sharedElement.renderInSharedTransitionScopeOverlay()
         this@sharedElement.sharedElement(
-            state = rememberSharedContentState(key),
+            sharedContentState = rememberSharedContentState(key),
             animatedVisibilityScope = scopes.animatedVisibilityScope,
             placeHolderSize = placeHolderSize,
             renderInOverlayDuringTransition = renderInOverlayDuringTransition,
@@ -170,12 +169,12 @@ fun OverlayParentClip(shape: Shape): OverlayClip =
         private val shapedPath = Path()
 
         override fun getClipPath(
-            state: SharedContentState,
+            sharedContentState: SharedContentState,
             bounds: Rect,
             layoutDirection: LayoutDirection,
             density: Density,
         ): Path {
-            val parentPath = state.parentSharedContentState?.clipPathInOverlay
+            val parentPath = sharedContentState.parentSharedContentState?.clipPathInOverlay
 
             shapedPath.reset()
             shapedPath.addOutline(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-aboutLibraries = "11.3.0-rc02"
+aboutLibraries = "11.4.0"
 android-gradle = "8.8.0"
-androidx-activity = "1.10.0-rc01"
-androidx-compose = "1.7.6"
-androidx-compose-material = "1.7.6"
-androidx-compose-material3 = "1.3.1"
+androidx-activity = "1.10.0"
+androidx-compose = "1.8.0-alpha08"
+androidx-compose-icons = "1.7.6"
+androidx-compose-material3 = "1.4.0-alpha06"
 androidx-lifecycle = "2.8.7"
 androidx-security = "1.1.0-alpha06"
 androidx-test = "1.6.1"
@@ -15,9 +15,11 @@ espresso = "3.6.1"
 google-ksp = "2.1.20-Beta1-1.0.29"
 # @keep
 java-jvmTarget = "17"
+junit = "4.13.2"
 junit5-bom = "5.11.4"
+junitVersion = "1.2.1"
 kermit = "2.0.5"
-koin = "4.0.1"
+koin = "4.1.0-Beta4"
 koin-annotations = "1.0.3"
 kotest = "5.9.1"
 kotest-arrow = "2.0.0"
@@ -43,8 +45,6 @@ sdk-min = "21"
 sdk-target = "35"
 shadow = "8.1.1"
 sqldelight = "2.0.2"
-junit = "4.13.2"
-junitVersion = "1.2.1"
 
 [libraries]
 aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutLibraries" }
@@ -57,8 +57,8 @@ androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
 androidx-collection = "androidx.collection:collection:1.4.5"
 androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
-androidx-compose-iconsCore = { module = "androidx.compose.material:material-icons-core", version.ref = "androidx-compose-material" }
-androidx-compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose-material" }
+androidx-compose-iconsCore = { module = "androidx.compose.material:material-icons-core", version.ref = "androidx-compose-icons" }
+androidx-compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose-icons" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidx-compose-material3" }
 androidx-compose-material3WindowSizeClass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "androidx-compose-material3" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
@@ -70,9 +70,10 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref
 androidx-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.1.0"
 androidx-constraintlayout-views = "androidx.constraintlayout:constraintlayout:2.2.0"
 androidx-core = "androidx.core:core-ktx:1.15.0"
-androidx-datastore = "androidx.datastore:datastore-preferences:1.1.1"
+androidx-datastore = "androidx.datastore:datastore-preferences:1.1.2"
 androidx-documentFile = "androidx.documentfile:documentfile:1.0.1"
 androidx-emoji2-core = "androidx.emoji2:emoji2:1.5.0"
+androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "androidx-lifecycle" }
@@ -86,7 +87,7 @@ androidx-test-runner = { module = "androidx.test:runner-ktx", version.ref = "and
 androidx-test-truth = { module = "androidx.test.ext:truth-ktx", version.ref = "androidx-test" }
 androidx-tracing = "androidx.tracing:tracing-ktx:1.2.0"
 androidx-vectorDrawables = "androidx.vectordrawable:vectordrawable:1.2.0"
-androidx-windowManager = "androidx.window:window:1.3.0"
+androidx-windowManager = "androidx.window:window:1.4.0-beta01"
 androidx-work = "androidx.work:work-runtime-ktx:2.10.0"
 arrowkt-bom = "io.arrow-kt:arrow-stack:2.0.0"
 arrowkt-core = { module = "io.arrow-kt:arrow-core" }
@@ -120,6 +121,7 @@ gradlePlugins-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v
 gradlePlugins-kotlin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "org-jetbrains-kotlin" }
 gradlePlugins-ktlint = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle" }
 gradlePlugins-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "shadow" }
+junit = { module = "junit:junit", version.ref = "junit" }
 junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5-bom" }
 junit5-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
 junit5-jupiter-runtime = { module = "org.junit.jupiter:junit-jupiter-engine" }
@@ -152,7 +154,7 @@ kotlinx-coroutines-common = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 kotlinx-dateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
-kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0-RC"
+kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
 ktlint-compose-rules = { module = "io.nlopez.compose.rules:ktlint", version.ref = "ktlintComposeRules" }
 ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
@@ -189,8 +191,6 @@ sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions",
 sqldelight-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-plugin = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
 sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 
 [bundles]
 ktor-client = [