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
2 changes: 1 addition & 1 deletion .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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 @@ -29,7 +29,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 @@ -77,7 +77,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 @@ -29,7 +29,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 @@ -29,7 +29,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 @@ -29,7 +29,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 @@ -29,7 +29,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 @@ -29,7 +29,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 @@ -77,7 +77,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 @@ -30,7 +30,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 @@ -30,7 +30,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 @@ -29,7 +29,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 @@ -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 Down Expand Up @@ -118,10 +118,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 @@ -130,7 +130,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.12.2'
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.12.2"
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"
window = "1.4.0"

[libraries]
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 @@ -120,11 +120,11 @@ dependencies {
debugImplementation "androidx.compose.ui:ui-tooling"
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 "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 @@ -135,7 +135,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.12.2"
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
2 changes: 1 addition & 1 deletion AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.12.1'
classpath 'com.android.tools.build:gradle:8.12.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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)

implementation 'androidx.activity:activity-compose:1.10.1'
Expand Down
2 changes: 1 addition & 1 deletion AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,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)

implementation 'androidx.activity:activity-compose:1.10.1'
Expand Down
4 changes: 2 additions & 2 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 @@ -72,7 +72,7 @@ dependencies {
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 '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 @@ -20,7 +20,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:8.12.1"
classpath "com.android.tools.build:gradle:8.12.2"
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 BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ android {

dependencies {
implementation("androidx.core:core-ktx:1.17.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.3")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3")
implementation("androidx.activity:activity-compose:1.10.1")
implementation(platform("androidx.compose:compose-bom:2025.08.00"))
implementation(platform("androidx.compose:compose-bom:2025.08.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
androidTestImplementation(platform("androidx.compose:compose-bom:2025.08.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.08.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.12.1'
classpath 'com.android.tools.build:gradle:8.12.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
6 changes: 3 additions & 3 deletions BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ android {

dependencies {
implementation("androidx.core:core-ktx:1.17.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.3")
implementation("androidx.activity:activity-compose:1.10.1")
implementation(platform("androidx.compose:compose-bom:2025.08.00"))
implementation(platform("androidx.compose:compose-bom:2025.08.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -76,7 +76,7 @@ dependencies {
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
androidTestImplementation(platform("androidx.compose:compose-bom:2025.08.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2025.08.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.12.1" apply false
id("com.android.application") version "8.12.2" apply false
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.1.21" apply false
}
8 changes: 4 additions & 4 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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 @@ -70,8 +70,8 @@ dependencies {
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,7 +80,7 @@ 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.github.bumptech.glide:glide:5.0.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.code.gson:gson:2.13.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android: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.12.2"
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
2 changes: 1 addition & 1 deletion NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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
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.12.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21"
}
Expand Down
Loading
Loading