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 @@ -35,7 +35,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

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

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

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

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

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

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
distribution: 'zulu'
java-version: 17

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

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2026.03.00')
def composeBom = platform('androidx.compose:compose-bom:2026.03.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand Down
2 changes: 1 addition & 1 deletion AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
}

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
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

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

2 changes: 1 addition & 1 deletion AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "9.1.0"
composeBom = "2026.03.00"
composeBom = "2026.03.01"
coreKtx = "1.18.0"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
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.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

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
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,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.03.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.0'
id 'com.google.devtools.ksp' version '2.3.6' 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.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

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

2 changes: 1 addition & 1 deletion AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.13.0'
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.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 AnimationCodelab/gradlew

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

2 changes: 1 addition & 1 deletion AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.13.0'
Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/app/build.gradle
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.03.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
2 changes: 1 addition & 1 deletion BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.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.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

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

4 changes: 2 additions & 2 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0")
implementation("androidx.activity:activity-compose:1.13.0")
implementation(platform("androidx.compose:compose-bom:2026.03.00"))
implementation(platform("androidx.compose:compose-bom:2026.03.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
Expand All @@ -82,7 +82,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:2026.03.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2026.03.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 @@ -27,7 +27,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.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.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 BasicStateCodelab/gradlew

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

2 changes: 1 addition & 1 deletion BasicsCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ androidxJunit = "1.3.0"
espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.13.0"
composeBom = "2026.03.00"
composeBom = "2026.03.01"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand Down
2 changes: 1 addition & 1 deletion BasicsCodelab/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.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 BasicsCodelab/gradlew

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

6 changes: 3 additions & 3 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

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

Expand All @@ -75,7 +75,7 @@ dependencies {
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 "androidx.work:work-runtime-ktx:2.11.2"
implementation "com.github.bumptech.glide:glide:5.0.5"
implementation "com.google.android.material:material:1.13.0"
implementation "com.google.code.gson:gson:2.13.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
2 changes: 1 addition & 1 deletion MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '8.3.0'
id 'com.diffplug.spotless' version '8.4.0'
id 'com.android.legacy-kapt' version '9.1.0' 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.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

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

Loading
Loading