From 541affe4f0b32363a381e398e86bf61430cb83d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 17:11:09 +0000 Subject: [PATCH 1/2] Bump the lib-dependencies group across 1 directory with 11 updates Bumps the lib-dependencies group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | androidx.lifecycle:lifecycle-viewmodel-navigation3 | `2.10.0-alpha03` | `2.10.0-alpha04` | | androidx.navigation3:navigation3-runtime | `1.0.0-alpha09` | `1.0.0-alpha10` | | androidx.navigation3:navigation3-ui | `1.0.0-alpha09` | `1.0.0-alpha10` | | androidx.work:work-runtime-ktx | `2.10.4` | `2.10.5` | | androidx.work:work-testing | `2.10.4` | `2.10.5` | | androidx.compose.material3:material3 | `1.3.2` | `1.4.0` | | androidx.compose.ui:ui-tooling | `1.9.1` | `1.9.2` | | androidx.compose.ui:ui-tooling-preview | `1.9.1` | `1.9.2` | | androidx.compose.runtime:runtime-livedata | `1.9.1` | `1.9.2` | | androidx.room:room-ktx | `2.8.0` | `2.8.1` | | androidx.room:room-compiler | `2.8.0` | `2.8.1` | Updates `androidx.lifecycle:lifecycle-viewmodel-navigation3` from 2.10.0-alpha03 to 2.10.0-alpha04 Updates `androidx.navigation3:navigation3-runtime` from 1.0.0-alpha09 to 1.0.0-alpha10 Updates `androidx.navigation3:navigation3-ui` from 1.0.0-alpha09 to 1.0.0-alpha10 Updates `androidx.navigation3:navigation3-ui` from 1.0.0-alpha09 to 1.0.0-alpha10 Updates `androidx.work:work-runtime-ktx` from 2.10.4 to 2.10.5 Updates `androidx.work:work-testing` from 2.10.4 to 2.10.5 Updates `androidx.work:work-testing` from 2.10.4 to 2.10.5 Updates `androidx.compose.material3:material3` from 1.3.2 to 1.4.0 Updates `androidx.compose.ui:ui-tooling` from 1.9.1 to 1.9.2 Updates `androidx.compose.ui:ui-tooling-preview` from 1.9.1 to 1.9.2 Updates `androidx.compose.ui:ui-tooling-preview` from 1.9.1 to 1.9.2 Updates `androidx.compose.runtime:runtime-livedata` from 1.9.1 to 1.9.2 Updates `androidx.room:room-ktx` from 2.8.0 to 2.8.1 Updates `androidx.room:room-compiler` from 2.8.0 to 2.8.1 Updates `androidx.room:room-compiler` from 2.8.0 to 2.8.1 --- updated-dependencies: - dependency-name: androidx.lifecycle:lifecycle-viewmodel-navigation3 dependency-version: 2.10.0-alpha04 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.navigation3:navigation3-runtime dependency-version: 1.0.0-alpha10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.navigation3:navigation3-ui dependency-version: 1.0.0-alpha10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.navigation3:navigation3-ui dependency-version: 1.0.0-alpha10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.work:work-runtime-ktx dependency-version: 2.10.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.work:work-testing dependency-version: 2.10.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.work:work-testing dependency-version: 2.10.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.compose.material3:material3 dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: lib-dependencies - dependency-name: androidx.compose.ui:ui-tooling dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.compose.ui:ui-tooling-preview dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.compose.ui:ui-tooling-preview dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.compose.runtime:runtime-livedata dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.room:room-ktx dependency-version: 2.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.room:room-compiler dependency-version: 2.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies - dependency-name: androidx.room:room-compiler dependency-version: 2.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: lib-dependencies ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f8f4fc8..b7a101aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,19 +8,19 @@ 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-alpha03" -androidx-nav3 = "1.0.0-alpha09" +androidx-lifecycle-nav3 = "2.10.0-alpha04" +androidx-nav3 = "1.0.0-alpha10" androidx-test-junit = "1.3.0" androidx-test-rules = "1.7.0" androidx-test-runner = "1.7.0" -androidx-work = "2.10.4" +androidx-work = "2.10.5" bitfire-cert4android = "41009d4" bitfire-synctools = "7aa709f6b6" compose-dialogs = "1.3.0" compose-material = "1.7.8" -compose-material3 = "1.3.2" -compose-runtime = "1.9.1" -compose-ui = "1.9.1" +compose-material3 = "1.4.0" +compose-runtime = "1.9.2" +compose-ui = "1.9.2" datastore = "1.1.7" desugaring = "2.1.5" hilt = "2.57.1" @@ -32,7 +32,7 @@ kotlinx-serialization-core = "1.9.0" ksp = "2.2.20-2.0.3" ktor = "3.3.0" okhttp = "5.1.0" -room = "2.8.0" +room = "2.8.1" [libraries] aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibs" } From bd30acb1352156cfa33faffe405db9b22f30b317 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Fri, 26 Sep 2025 14:37:49 +0200 Subject: [PATCH 2/2] Fix imports Signed-off-by: Arnau Mora --- app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt b/app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt index 737c2fe3..d379c7eb 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt @@ -13,17 +13,16 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.core.content.IntentCompat import androidx.compose.ui.platform.LocalContext import androidx.core.app.ShareCompat +import androidx.core.content.IntentCompat import androidx.core.os.BundleCompat import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator -import androidx.navigation3.runtime.entry import androidx.navigation3.runtime.entryProvider import androidx.navigation3.runtime.rememberNavBackStack import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator +import androidx.navigation3.scene.rememberSceneSetupNavEntryDecorator import androidx.navigation3.ui.NavDisplay -import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_ERROR_MESSAGE import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_REQUEST_CALENDAR_PERMISSION import at.bitfire.icsdroid.MainActivity.Companion.EXTRA_THROWABLE @@ -31,8 +30,8 @@ import at.bitfire.icsdroid.R import at.bitfire.icsdroid.service.ComposableStartupService import at.bitfire.icsdroid.ui.partials.AlertDialog import at.bitfire.icsdroid.ui.screen.AddSubscriptionScreen -import at.bitfire.icsdroid.ui.screen.InfoScreen import at.bitfire.icsdroid.ui.screen.EditSubscriptionScreen +import at.bitfire.icsdroid.ui.screen.InfoScreen import at.bitfire.icsdroid.ui.screen.SubscriptionsScreen import java.util.ServiceLoader