Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
- uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
distribution: 'zulu'
java-version: 17

- uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
- uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation 'androidx.core:core-ktx:1.19.1'
implementation "androidx.activity:activity-compose:1.13.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.11.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0"

implementation 'androidx.navigation:navigation-compose:2.10.1'
implementation 'androidx.navigation:navigation-compose:2.10.2'

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
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.4.0'
classpath 'com.android.tools.build:gradle:9.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
}
}

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

Expand Down
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
androidGradlePlugin = "9.4.0"
androidGradlePlugin = "9.4.1"
composeBom = "2026.09.00"
coreKtx = "1.19.0"
coreKtx = "1.19.1"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
junit = "4.13.2"
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ dependencies {

implementation "androidx.activity:activity-compose:1.13.0"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.tracing:tracing:2.0.2"
implementation "androidx.tracing:tracing:2.0.3"

def composeBom = platform('androidx.compose:compose-bom:2026.09.00')
implementation(composeBom)
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:9.4.0"
classpath "com.android.tools.build:gradle:9.4.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.60.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.10.2'
id 'com.diffplug.spotless' version '8.10.3'
id 'com.google.devtools.ksp' version '2.3.12' apply false
}

Expand Down
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
implementation(composeBom)
androidTestImplementation(composeBom)

implementation 'androidx.core:core-ktx:1.19.0'
implementation 'androidx.core:core-ktx:1.19.1'
implementation "androidx.compose.ui:ui"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
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.4.0"
classpath "com.android.tools.build:gradle:9.4.1"
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.10.2'
id 'com.diffplug.spotless' version '8.10.3'
}

subprojects {
Expand Down
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
14 changes: 7 additions & 7 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ dependencies {
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.constraintlayout:constraintlayout:2.2.2"
implementation "androidx.core:core-ktx:1.19.0"
implementation "androidx.fragment:fragment-ktx:1.9.0"
implementation "androidx.core:core-ktx:1.19.1"
implementation "androidx.fragment:fragment-ktx:1.9.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.10.1"
implementation "androidx.navigation:navigation-ui-ktx:2.10.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.10.2"
implementation "androidx.navigation:navigation-ui-ktx:2.10.2"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.8.5"
implementation "androidx.room:room-ktx:2.8.5"
implementation "androidx.tracing:tracing:2.0.2"
implementation "androidx.tracing:tracing:2.0.3"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.11.2"
implementation "androidx.work:work-runtime-ktx:2.12.0"
implementation "com.github.bumptech.glide:glide:5.0.9"
implementation "com.google.android.material:material:1.14.0"
implementation "com.google.code.gson:gson:2.14.0"
Expand All @@ -100,7 +100,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.4.0"
androidTestImplementation "androidx.work:work-testing:2.11.2"
androidTestImplementation "androidx.work:work-testing:2.12.0"
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
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.4.0"
classpath "com.android.tools.build:gradle:9.4.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.10.1"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.10.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
}
}

plugins {
id 'com.diffplug.spotless' version '8.10.2'
id 'com.android.legacy-kapt' version '9.4.0' apply false
id 'com.diffplug.spotless' version '8.10.3'
id 'com.android.legacy-kapt' version '9.4.1' apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
6 changes: 3 additions & 3 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
androidTestImplementation(composeBom)

implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "androidx.core:core-ktx:1.19.1"
implementation "com.google.android.material:material:1.14.0"

// Compose
Expand All @@ -87,12 +87,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.10.1"
implementation "androidx.navigation:navigation-compose:2.10.2"
debugImplementation "androidx.compose.ui:ui-tooling"

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

Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
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.4.0"
classpath "com.android.tools.build:gradle:9.4.1"
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.10.2'
id 'com.diffplug.spotless' version '8.10.3'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[versions]
coil = "2.7.0"
com-android-application = "9.4.0"
com-android-application = "9.4.1"
desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.7.1-0.6.x-compat"
lifecycle-viewmodel-compose = "2.11.0"
material-icons-core = "1.7.8"
media3 = "1.11.0"
media3 = "1.11.1"
org-jetbrains-kotlin-android = "2.3.10"
core-ktx = "1.19.0"
core-ktx = "1.19.1"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.11.0"
activity-compose = "1.13.0"
compose-bom = "2026.09.00"
runtime-tracing = "1.12.1"
tracing-ktx = "2.0.2"
tracing-ktx = "2.0.3"
tracing-perfetto = "1.0.1"
uiautomator = "2.4.0"
benchmark = "1.5.0"
androidx-baselineprofile = "1.5.0"
profileinstaller = "1.4.1"
material3 = "1.4.0"
spotless = "8.10.2"
spotless = "8.10.3"
ktlint = "1.2.1"

[libraries]
Expand Down
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
8 changes: 4 additions & 4 deletions TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ buildscript {
coreTestingVersion = '2.2.0'
coroutinesVersion = "1.5.2"
espressoVersion = '3.7.0'
fragmentVersion = '1.9.0'
fragmentVersion = '1.9.1'
junitVersion = '4.13.1'
kotlinVersion = '2.3.10'
ktlintVersion = '0.48.2'
ktxVersion = '1.19.0'
ktxVersion = '1.19.1'
lifecycleVersion = '2.3.0'
materialVersion = '1.14.0'
runnerVersion = '1.0.1'
Expand All @@ -48,14 +48,14 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:9.4.0"
classpath "com.android.tools.build:gradle:9.4.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
}
}

plugins {
id 'com.diffplug.spotless' version '8.10.2'
id 'com.diffplug.spotless' version '8.10.3'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/gradle/wrapper/gradle-wrapper.properties
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation 'androidx.core:core-ktx:1.19.1'
implementation "androidx.activity:activity-compose:1.13.0"

implementation "androidx.lifecycle:lifecycle-runtime-compose:2.11.0"
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
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.4.0'
classpath 'com.android.tools.build:gradle:9.4.1'
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.10.2'
id 'com.diffplug.spotless' version '8.10.3'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
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.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Loading