Skip to content

Update all dependencies (end) #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MagicalMeghan merged 3 commits into from
Apr 27, 2026
Merged

Update all dependencies (end) #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b377c3
Update all dependencies
renovate[bot] Apr 24, 2026
bf94294
update locale in nav codelab end
MagicalMeghan Apr 24, 2026
12b1ecd
Update locale
MagicalMeghan Apr 24, 2026
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
4 changes: 2 additions & 2 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.04.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -105,7 +105,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0"

implementation 'androidx.navigation:navigation-compose:2.9.7'
implementation 'androidx.navigation:navigation-compose:2.9.8'

androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test:runner:1.7.0'
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:9.1.0'
classpath 'com.android.tools.build:gradle:9.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.3.10" apply false
}

Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "9.1.0"
composeBom = "2026.03.00"
androidGradlePlugin = "9.2.0"
composeBom = "2026.04.01"
coreKtx = "1.18.0"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.04.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:9.1.0"
classpath "com.android.tools.build:gradle:9.2.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.google.devtools.ksp' version '2.3.6' apply false
id 'com.diffplug.spotless' version '8.4.0'
id 'com.google.devtools.ksp' version '2.3.7' apply false
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.04.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:9.1.0"
classpath "com.android.tools.build:gradle:9.2.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.0'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.04.01')
implementation(composeBom)
androidTestImplementation(composeBom)

kapt "androidx.room:room-compiler:2.8.4"
kapt "com.github.bumptech.glide:compiler:5.0.5"
kapt "com.github.bumptech.glide:compiler:5.0.7"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
implementation "androidx.core:core-ktx:1.18.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.7"
implementation "androidx.navigation:navigation-ui-ktx:2.9.7"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.8"
implementation "androidx.navigation:navigation-ui-ktx:2.9.8"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.8.4"
implementation "androidx.room:room-ktx:2.8.4"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.11.1"
implementation "com.github.bumptech.glide:glide:5.0.5"
implementation "androidx.work:work-runtime-ktx:2.11.2"
implementation "com.github.bumptech.glide:glide:5.0.7"
implementation "com.google.android.material:material:1.13.0"
implementation "com.google.code.gson:gson:2.13.2"
implementation "com.google.code.gson:gson:2.14.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"

Expand All @@ -99,7 +99,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-intents:3.7.0"
androidTestImplementation "androidx.test.ext:junit:1.3.0"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
androidTestImplementation "androidx.work:work-testing:2.11.1"
androidTestImplementation "androidx.work:work-testing:2.11.2"
androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1"
androidTestImplementation "com.google.truth:truth:1.4.5"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
Expand Down
8 changes: 4 additions & 4 deletions MigrationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:9.1.0"
classpath "com.android.tools.build:gradle:9.2.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.7"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.8"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.android.legacy-kapt' version '9.1.0' apply false
id 'com.diffplug.spotless' version '8.4.0'
id 'com.android.legacy-kapt' version '9.2.0' apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.04.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -91,12 +91,12 @@ dependencies {
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.activity:activity-compose:1.13.0"
implementation "androidx.navigation:navigation-compose:2.9.7"
implementation "androidx.navigation:navigation-compose:2.9.8"
debugImplementation "androidx.compose.ui:ui-tooling"

// Testing dependencies
androidTestImplementation "androidx.arch.core:core-testing:2.2.0"
androidTestImplementation "androidx.navigation:navigation-testing:2.9.7"
androidTestImplementation "androidx.navigation:navigation-testing:2.9.8"
androidTestImplementation "androidx.test.espresso:espresso-contrib:3.7.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"

Expand Down
3 changes: 2 additions & 1 deletion NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/components/RallyTabRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.example.compose.rally.RallyDestination
import java.util.Locale
import androidx.compose.ui.platform.LocalLocale

@Composable
fun RallyTabRow(
Expand Down Expand Up @@ -113,7 +114,7 @@ private fun RallyTab(
Icon(imageVector = icon, contentDescription = text, tint = tabTintColor)
if (selected) {
Spacer(Modifier.width(12.dp))
Text(text.uppercase(Locale.getDefault()), color = tabTintColor)
Text(text.uppercase(LocalLocale.current.platformLocale), color = tabTintColor)
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion NavigationCodelab/app/src/main/java/com/example/compose/rally/ui/overview/OverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import com.example.compose.rally.ui.components.RallyAlertDialog
import com.example.compose.rally.ui.components.RallyDivider
import com.example.compose.rally.ui.components.formatAmount
import java.util.Locale
import androidx.compose.ui.platform.LocalLocale

@Composable
fun OverviewScreen(
Expand Down Expand Up @@ -97,7 +98,7 @@ private fun AlertCard() {
showDialog = false
},
bodyText = alertMessage,
buttonText = "Dismiss".uppercase(Locale.getDefault())
buttonText = "Dismiss".uppercase(LocalLocale.current.platformLocale)
)
}
Card {
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:9.1.0"
classpath "com.android.tools.build:gradle:9.2.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.0'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion PerformanceCodelab/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
implementation(libs.androidx.tracing.ktx)

// TODO Codelab task: Add androidx.runtime-tracing dependency to enable Composition Tracing
implementation("androidx.compose.runtime:runtime-tracing:1.10.5")
implementation("androidx.compose.runtime:runtime-tracing:1.11.0")

implementation(libs.coil.compose)
implementation(libs.androidx.media3.exoplayer)
Expand Down
12 changes: 6 additions & 6 deletions PerformanceCodelab/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[versions]
coil = "2.7.0"
com-android-application = "9.1.0"
com-android-application = "9.2.0"
desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.7.1-0.6.x-compat"
lifecycle-viewmodel-compose = "2.10.0"
material-icons-core = "1.7.8"
media3 = "1.9.2"
media3 = "1.10.0"
org-jetbrains-kotlin-android = "2.3.10"
core-ktx = "1.18.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.10.0"
activity-compose = "1.13.0"
compose-bom = "2026.03.00"
runtime-tracing = "1.10.5"
compose-bom = "2026.04.01"
runtime-tracing = "1.11.0"
tracing-ktx = "1.3.0"
tracing-perfetto = "1.0.1"
uiautomator = "2.3.0"
benchmark = "1.4.1"
androidx-baselineprofile = "1.5.0-alpha04"
androidx-baselineprofile = "1.5.0-alpha05"
profileinstaller = "1.4.1"
material3 = "1.4.0"
spotless = "8.3.0"
spotless = "8.4.0"
ktlint = "1.2.1"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading