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
4 changes: 2 additions & 2 deletions .github/workflows/AccessibilityCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -77,12 +77,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down Expand Up @@ -77,12 +77,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ 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

- uses: gradle/actions/setup-gradle@v4
- uses: gradle/actions/setup-gradle@v5

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
18 changes: 9 additions & 9 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.10.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -114,23 +114,23 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.activity:activity-ktx:1.10.1'
implementation 'androidx.activity:activity-ktx:1.11.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.activity:activity-compose:1.11.0"

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.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.4"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4"

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

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

// 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
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:8.12.1'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20"
}
}

plugins {
id 'com.diffplug.spotless' version '7.2.1'
id 'com.diffplug.spotless' version '8.0.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.2.20" 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.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

defaultConfig {
applicationId = "com.example.reply"
minSdk = 21
minSdk = 23
targetSdk = 33
versionCode = 1
versionName = "1.0"
Expand Down
10 changes: 5 additions & 5 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]
androidGradlePlugin = "8.12.1"
composeBom = "2025.08.00"
androidGradlePlugin = "8.13.0"
composeBom = "2025.10.00"
coreKtx = "1.17.0"
activityCompose = "1.10.1"
activityCompose = "1.11.0"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.2.20"
kotlinxCoroutinesAndroid = "1.10.2"
lifecycle = "2.9.2"
window = "1.4.0"
lifecycle = "2.9.4"
window = "1.5.0"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
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.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
16 changes: 8 additions & 8 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.10.1"
implementation "androidx.activity:activity-compose:1.11.0"
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.10.00')
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.4"
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.2"
kapt "com.google.dagger:hilt-compiler:2.57.2"

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.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2"
}
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
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:8.12.1"
classpath "com.android.tools.build:gradle:8.13.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20"
}
}

plugins {
id 'com.diffplug.spotless' version '7.2.1'
id 'com.diffplug.spotless' version '8.0.0'
}

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.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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.13.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.20"
}
Expand Down
5 changes: 3 additions & 2 deletions AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'androidx.activity:activity-compose:1.11.0'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.compose.material:material-icons-core"
debugImplementation "androidx.compose.ui:ui-tooling"
}
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.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading
Loading