Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: 17
Expand Down
12 changes: 6 additions & 6 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down Expand Up @@ -101,10 +101,10 @@ dependencies {
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.10.1"

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

implementation 'androidx.navigation:navigation-compose:2.9.3'

Expand All @@ -113,7 +113,7 @@ dependencies {

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
testImplementation 'org.robolectric:robolectric:4.15.1'
testImplementation 'org.robolectric:robolectric:4.16'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.12.1'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
}
}
Expand Down
6 changes: 3 additions & 3 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
androidGradlePlugin = "8.12.1"
composeBom = "2025.08.00"
androidGradlePlugin = "8.13.0"
composeBom = "2025.08.01"
coreKtx = "1.17.0"
activityCompose = "1.10.1"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.1.21"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.9.2"
lifecycle = "2.9.3"
material3Adaptive = "1.1.0"
material3AdaptiveNavSuite = "1.3.2"
window = "1.4.0"
Expand Down
14 changes: 7 additions & 7 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -121,12 +121,12 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-test-manifest"


def lifecycle_version = "2.9.2"
def lifecycle_version = "2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "com.google.dagger:hilt-android:2.57"
kapt "com.google.dagger:hilt-compiler:2.57"
implementation "com.google.dagger:hilt-android:2.57.1"
kapt "com.google.dagger:hilt-compiler:2.57.1"

implementation "io.coil-kt:coil-compose:2.7.0"

Expand All @@ -137,7 +137,7 @@ dependencies {
androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
androidTestImplementation "com.google.dagger:hilt-android:2.57"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57"
androidTestImplementation "com.google.dagger:hilt-android:2.57.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.1"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.1"
}
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
}
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ android {
}

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

Expand All @@ -71,8 +71,8 @@ dependencies {
implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.12.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2'
implementation "com.google.android.material:material:1.13.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.3'
implementation 'androidx.activity:activity-compose:1.10.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
12 changes: 6 additions & 6 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ android {
}

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

kapt "androidx.room:room-compiler:2.7.2"
kapt "com.github.bumptech.glide:compiler:4.16.0"
kapt "com.github.bumptech.glide:compiler:5.0.4"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
implementation "androidx.core:core-ktx:1.17.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.3"
implementation "androidx.navigation:navigation-ui-ktx:2.9.3"
implementation "androidx.recyclerview:recyclerview:1.4.0"
Expand All @@ -80,8 +80,8 @@ dependencies {
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.10.3"
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.github.bumptech.glide:glide:5.0.4"
implementation "com.google.android.material:material:1.13.0"
implementation "com.google.code.gson:gson:2.13.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
Expand Down
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.3"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.core:core-ktx:1.17.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.android.material:material:1.13.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
8 changes: 4 additions & 4 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
coil = "2.7.0"
com-android-application = "8.12.1"
com-android-application = "8.13.0"
desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.6.2"
lifecycle-viewmodel-compose = "2.9.2"
lifecycle-viewmodel-compose = "2.9.3"
material-icons-core = "1.7.8"
media3 = "1.8.0"
org-jetbrains-kotlin-android = "2.1.21"
core-ktx = "1.17.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.9.2"
lifecycle-runtime-ktx = "2.9.3"
activity-compose = "1.10.1"
compose-bom = "2025.08.00"
compose-bom = "2025.08.01"
runtime-tracing = "1.9.0"
tracing-ktx = "1.3.0"
tracing-perfetto = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ android {
}

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

Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ buildscript {
ktlintVersion = '0.48.2'
ktxVersion = '1.17.0'
lifecycleVersion = '2.3.0'
materialVersion = '1.12.0'
materialVersion = '1.13.0'
runnerVersion = '1.0.1'
truthVersion = '1.0.1'
testExtJunit = '1.1.3'
Expand All @@ -48,7 +48,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
}
Expand Down
12 changes: 6 additions & 6 deletions ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2025.08.00')
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -114,11 +114,11 @@ dependencies {
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.10.1"

implementation "androidx.lifecycle:lifecycle-runtime-compose:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2"
implementation "androidx.lifecycle:lifecycle-runtime-compose:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.3"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"

androidTestImplementation 'androidx.test:rules:1.7.0'
androidTestImplementation 'androidx.test:runner:1.7.0'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.12.1'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down