Skip to content

Commit e1ce41f

Browse files
authored
Merge pull request #547 from android/renovate/end-all
Update all dependencies (end)
2 parents 083f7eb + a0604f3 commit e1ce41f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+108
-139
lines changed

AccessibilityCodelab/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070
}
7171

7272
dependencies {
73-
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
73+
def composeBom = platform('androidx.compose:compose-bom:2025.10.00')
7474
implementation(composeBom)
7575
testImplementation(composeBom)
7676
androidTestImplementation(composeBom)
@@ -97,16 +97,16 @@ dependencies {
9797
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
9898

9999
implementation 'androidx.appcompat:appcompat:1.7.1'
100-
implementation 'androidx.activity:activity-ktx:1.10.1'
100+
implementation 'androidx.activity:activity-ktx:1.11.0'
101101
implementation 'androidx.core:core-ktx:1.17.0'
102-
implementation "androidx.activity:activity-compose:1.10.1"
102+
implementation "androidx.activity:activity-compose:1.11.0"
103103

104-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3"
105-
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
106-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3"
107-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"
104+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4"
105+
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4"
106+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4"
107+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4"
108108

109-
implementation 'androidx.navigation:navigation-compose:2.9.3'
109+
implementation 'androidx.navigation:navigation-compose:2.9.5'
110110

111111
androidTestImplementation 'androidx.test:rules:1.7.0'
112112
androidTestImplementation 'androidx.test:runner:1.7.0'

AccessibilityCodelab/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ buildscript {
2727
}
2828

2929
plugins {
30-
id 'com.diffplug.spotless' version '7.2.1'
30+
id 'com.diffplug.spotless' version '8.0.0'
3131
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.21" apply false
3232
}
3333

1.65 KB
Binary file not shown.

AccessibilityCodelab/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.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

AccessibilityCodelab/gradlew

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

AccessibilityCodelab/gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

AdaptiveUiCodelab/app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626

2727
defaultConfig {
2828
applicationId = "com.example.reply"
29-
minSdk = 21
29+
minSdk = 23
3030
targetSdk = 33
3131
versionCode = 1
3232
versionName = "1.0"

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/ReplyApp.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ import androidx.compose.runtime.Composable
3333
import androidx.compose.runtime.getValue
3434
import androidx.compose.runtime.mutableStateOf
3535
import androidx.compose.runtime.remember
36+
import androidx.compose.runtime.rememberCoroutineScope
3637
import androidx.compose.runtime.setValue
3738
import androidx.compose.ui.platform.LocalDensity
3839
import androidx.compose.ui.res.stringResource
3940
import androidx.compose.ui.unit.dp
4041
import androidx.compose.ui.unit.toSize
4142
import com.example.reply.data.Email
43+
import kotlinx.coroutines.launch
4244

4345
private val WINDOW_WIDTH_LARGE = 1200.dp
4446

@@ -100,9 +102,10 @@ fun ReplyAppContent(
100102
) {
101103
val selectedEmail = replyHomeUIState.selectedEmail
102104
val navigator = rememberListDetailPaneScaffoldNavigator<Long>()
105+
val coroutineScope = rememberCoroutineScope()
103106

104107
BackHandler(navigator.canNavigateBack()) {
105-
navigator.navigateBack()
108+
coroutineScope.launch { navigator.navigateBack() }
106109
}
107110

108111
ListDetailPaneScaffold(
@@ -114,7 +117,9 @@ fun ReplyAppContent(
114117
replyHomeUIState = replyHomeUIState,
115118
onEmailClick = { email ->
116119
onEmailClick(email)
117-
navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, email.id)
120+
coroutineScope.launch {
121+
navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, email.id)
122+
}
118123
}
119124
)
120125
}

AdaptiveUiCodelab/gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
androidGradlePlugin = "8.13.0"
3-
composeBom = "2025.08.01"
3+
composeBom = "2025.10.00"
44
coreKtx = "1.17.0"
5-
activityCompose = "1.10.1"
5+
activityCompose = "1.11.0"
66
espressoCore = "3.7.0"
77
junit = "4.13.2"
88
junitVersion = "1.3.0"
99
kotlin = "2.1.21"
1010
kotlinxCoroutinesAndroid = "1.10.2"
11-
lifecycle = "2.9.3"
11+
lifecycle = "2.9.4"
1212
material3Adaptive = "1.1.0"
13-
material3AdaptiveNavSuite = "1.3.2"
14-
window = "1.4.0"
13+
material3AdaptiveNavSuite = "1.4.0"
14+
window = "1.5.0"
1515

1616
[libraries]
1717
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
1.65 KB
Binary file not shown.

0 commit comments

Comments
 (0)