Skip to content

Commit e351dfd

Browse files
authored
Merge pull request #5 from android/riggaroo/deps-update
Update to latest dependencies (nav)
2 parents f01bade + 96e83c4 commit e351dfd

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ import androidx.compose.runtime.setValue
3232
import androidx.compose.ui.graphics.TransformOrigin
3333
import androidx.compose.ui.unit.IntOffset
3434
import androidx.lifecycle.viewmodel.navigation3.ViewModelStoreNavEntryDecorator
35+
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
3536
import androidx.navigation3.runtime.SavedStateNavEntryDecorator
3637
import androidx.navigation3.runtime.entry
3738
import androidx.navigation3.runtime.entryProvider
39+
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
3840
import androidx.navigation3.ui.NavDisplay
3941
import androidx.navigation3.ui.SceneSetupNavEntryDecorator
4042
import com.android.developers.androidify.camera.CameraPreviewScreen
@@ -73,9 +75,8 @@ fun MainNavigation() {
7375
backStack = backStack,
7476
onBack = { backStack.removeLastOrNull() },
7577
entryDecorators = listOf(
76-
SceneSetupNavEntryDecorator,
77-
SavedStateNavEntryDecorator,
78-
ViewModelStoreNavEntryDecorator,
78+
rememberSavedStateNavEntryDecorator(),
79+
rememberViewModelStoreNavEntryDecorator(),
7980
),
8081
transitionSpec = {
8182
ContentTransform(

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ appcompat = "1.7.0"
1616
baselineprofile = "1.3.4"
1717
benchmarkMacroJunit4 = "1.3.4"
1818
camerax = "1.5.0-SNAPSHOT"
19-
coilCompose = "3.1.0"
20-
coilGif = "3.1.0"
21-
composeBom = "2025.04.01"
19+
coilCompose = "3.2.0"
20+
coilGif = "3.2.0"
21+
composeBom = "2025.05.00"
2222
concurrent = "1.2.0"
2323
converterGson = "2.11.0"
2424
coreKtx = "1.15.0"
@@ -43,7 +43,7 @@ lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT"
4343
loggingInterceptor = "5.0.0-alpha.14"
4444
material = "1.12.0"
4545
media3 = "1.6.1"
46-
navigation3 = "0.1.0-SNAPSHOT"
46+
navigation3 = "1.0.0-SNAPSHOT"
4747
okhttp = "4.12.0"
4848
poseDetection = "18.0.0-beta5"
4949
profileinstaller = "1.4.1"

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pluginManagement {
1212
maven {
1313
// You can find the maven URL for other artifacts (e.g. KMP, METALAVA) on their
1414
// build pages.
15-
url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
15+
url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
1616
}
1717

1818
}
@@ -23,7 +23,7 @@ dependencyResolutionManagement {
2323
google()
2424
mavenCentral()
2525
maven {
26-
url = uri("https://androidx.dev/snapshots/builds/13467503/artifacts/repository")
26+
url = uri("https://androidx.dev/snapshots/builds/13496591/artifacts/repository")
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)