Skip to content

Commit 7844c73

Browse files
authored
Merge pull request #107 from android/renovate/all
fix(deps): update all dependencies
2 parents 6b36dcc + 849098b commit 7844c73

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

.github/workflows/Fruitties.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
java-version: 17
4141

4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v4
43+
uses: gradle/actions/setup-gradle@v5
4444
with:
4545
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4646

Fruitties/androidApp/src/main/java/com/example/fruitties/android/MainActivity.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ import androidx.compose.runtime.CompositionLocalProvider
2828
import androidx.compose.ui.Modifier
2929
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
3030
import androidx.navigation3.runtime.NavKey
31-
import androidx.navigation3.runtime.entry
3231
import androidx.navigation3.runtime.entryProvider
3332
import androidx.navigation3.runtime.rememberNavBackStack
34-
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
33+
import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
3534
import androidx.navigation3.ui.NavDisplay
36-
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
3735
import com.example.fruitties.android.ui.CartScreen
3836
import com.example.fruitties.android.ui.FruittieScreen
3937
import com.example.fruitties.android.ui.FruittiesTheme
@@ -79,11 +77,9 @@ fun NavApp() {
7977
NavDisplay(
8078
backStack = backStack,
8179
entryDecorators = listOf(
82-
rememberSceneSetupNavEntryDecorator(),
83-
rememberSavedStateNavEntryDecorator(),
80+
rememberSaveableStateHolderNavEntryDecorator(),
8481
rememberViewModelStoreNavEntryDecorator(),
8582
),
86-
onBack = { keysToRemove -> repeat(keysToRemove) { backStack.removeLastOrNull() } },
8783
entryProvider = entryProvider {
8884
entry<ListScreenKey> {
8985
ListScreen(

Fruitties/gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@
1313
# limitations under the License.
1414

1515
[versions]
16-
agp = "8.13.0"
16+
agp = "8.13.1"
1717
androidx-activityCompose = "1.11.0"
1818
androidx-paging = "3.3.6"
19-
nav3Core = "1.0.0-alpha09"
19+
nav3Core = "1.0.0-rc01"
2020
lifecycleViewmodelNav3 = "1.0.0-alpha04"
2121
kotlinxSerializationCore = "1.9.0"
22-
androidx-room = "2.8.0"
22+
androidx-room = "2.8.3"
2323
androidx-lifecycle = "2.9.4"
2424
atomicfu = "0.29.0"
25-
composeBom = "2025.09.00"
25+
composeBom = "2025.11.00"
2626
dataStore = "1.1.7"
2727
kotlin = "2.2.21"
2828
kotlinx-coroutines = "1.10.2"
2929
kotlinxDatetime = "0.7.1-0.6.x-compat"
3030
ksp = "2.3.3"
31-
ktorVersion = "3.3.0"
31+
ktorVersion = "3.3.2"
3232
pagingComposeAndroid = "3.3.6"
3333
skie = "0.10.8"
34-
sqlite = "2.6.0"
35-
spotless = "7.2.1"
36-
okio = "3.16.0"
34+
sqlite = "2.6.1"
35+
spotless = "8.1.0"
36+
okio = "3.16.4"
3737
kermit = "2.0.8"
3838
runner = "1.7.0"
3939
core = "1.7.0"
4040
junit = "1.3.0"
4141
materialIconsCore = "1.7.8"
42-
material3 = "1.4.0-rc01"
42+
material3 = "1.4.0"
4343

4444
[libraries]
4545
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
176 Bytes
Binary file not shown.

Fruitties/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)