Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import androidx.core.os.BundleCompat
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.rememberNavBackStack
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator
import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
import androidx.navigation3.ui.NavDisplay
import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_ERROR_MESSAGE
import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_REQUEST_CALENDAR_PERMISSION
Expand Down Expand Up @@ -103,8 +102,7 @@ fun MainApp(

NavDisplay(
entryDecorators = listOf(
rememberSceneSetupNavEntryDecorator(),
rememberSavedStateNavEntryDecorator(),
rememberSaveableStateHolderNavEntryDecorator(),
rememberViewModelStoreNavEntryDecorator()
),
backStack = backStack,
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
aboutLibs = "12.2.4"
aboutLibs = "13.0.0"
agp = "8.13.0"
androidx-activityCompose = "1.11.0"
androidx-appCompat = "1.7.1"
Expand All @@ -8,8 +8,8 @@ androidx-core = "1.17.0"
androidx-hilt = "1.3.0"
androidx-lifecycle = "2.9.4"
# should be replaced by androidx-lifecycle once nav3 is stable (probably 2.10.0?)
androidx-lifecycle-nav3 = "2.10.0-alpha04"
androidx-nav3 = "1.0.0-alpha10"
androidx-lifecycle-nav3 = "2.10.0-alpha05"
androidx-nav3 = "1.0.0-alpha11"
androidx-test-junit = "1.3.0"
androidx-test-rules = "1.7.0"
androidx-test-runner = "1.7.0"
Expand All @@ -19,8 +19,8 @@ bitfire-synctools = "7aa709f6b6"
compose-dialogs = "1.3.0"
compose-material = "1.7.8"
compose-material3 = "1.4.0"
compose-runtime = "1.9.2"
compose-ui = "1.9.2"
compose-runtime = "1.9.3"
compose-ui = "1.9.3"
datastore = "1.1.7"
desugaring = "2.1.5"
hilt = "2.57.2"
Expand All @@ -29,10 +29,10 @@ junit = "4.13.2"
kotlin = "2.2.20"
kotlinx-coroutines = "1.10.2"
kotlinx-serialization-core = "1.9.0"
ksp = "2.2.20-2.0.3"
ktor = "3.3.0"
okhttp = "5.1.0"
room = "2.8.1"
ksp = "2.2.20-2.0.4"
ktor = "3.3.1"
okhttp = "5.2.1"
room = "2.8.2"

[libraries]
aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibs" }
Expand Down
Loading