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 @@ -42,14 +42,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

- name: Upload test reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-reports-state-${{ matrix.api-level }}
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions .github/workflows/MigrationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

- name: Upload test reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-reports-migration-${{ matrix.api-level }}
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/NavigationCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/TestingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
4 changes: 2 additions & 2 deletions .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ jobs:
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
6 changes: 3 additions & 3 deletions 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.01.01')
def composeBom = platform('androidx.compose:compose-bom:2026.02.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -113,9 +113,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.activity:activity-ktx:1.12.3'
implementation 'androidx.activity:activity-ktx:1.12.4'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.activity:activity-compose:1.12.3"
implementation "androidx.activity:activity-compose:1.12.4"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0"
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:9.0.0'
classpath 'com.android.tools.build:gradle:9.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
}
}
Expand Down
1 change: 0 additions & 1 deletion AdaptiveUiCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ buildscript {

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.compose.compiler) apply false
}
7 changes: 3 additions & 4 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
androidGradlePlugin = "9.0.0"
composeBom = "2026.01.01"
androidGradlePlugin = "9.0.1"
composeBom = "2026.02.01"
coreKtx = "1.17.0"
activityCompose = "1.12.3"
activityCompose = "1.12.4"
espressoCore = "3.7.0"
junit = "4.13.2"
junitVersion = "1.3.0"
Expand Down Expand Up @@ -32,5 +32,4 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine

[plugins]
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
14 changes: 7 additions & 7 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ dependencies {
}
}

implementation "androidx.activity:activity-compose:1.12.3"
implementation "androidx.activity:activity-compose:1.12.4"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"

def composeBom = platform('androidx.compose:compose-bom:2026.01.01')
def composeBom = platform('androidx.compose:compose-bom:2026.02.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand All @@ -119,8 +119,8 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

implementation "com.google.dagger:hilt-android:2.59.1"
ksp "com.google.dagger:hilt-compiler:2.59.1"
implementation "com.google.dagger:hilt-android:2.59.2"
ksp "com.google.dagger:hilt-compiler:2.59.2"
ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"

implementation "io.coil-kt:coil-compose:2.7.0"
Expand All @@ -132,8 +132,8 @@ 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.59.1"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.1"
kspAndroidTest "com.google.dagger:hilt-compiler:2.59.1"
androidTestImplementation "com.google.dagger:hilt-android:2.59.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.2"
kspAndroidTest "com.google.dagger:hilt-compiler:2.59.2"
kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
}
8 changes: 4 additions & 4 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:9.0.0"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.1"
classpath "com.android.tools.build:gradle:9.0.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.2"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.4"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.6"
}
}

plugins {
id 'com.diffplug.spotless' version '8.2.1'
id 'com.google.devtools.ksp' version '2.3.4' apply false
id 'com.google.devtools.ksp' version '2.3.6' apply false
}

subprojects {
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:9.0.0'
classpath 'com.android.tools.build:gradle:9.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/finished/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.12.3'
implementation 'androidx.activity:activity-compose:1.12.4'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ android {
}

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

implementation 'androidx.activity:activity-compose:1.12.3'
implementation 'androidx.activity:activity-compose:1.12.4'
implementation 'androidx.core:core-ktx:1.17.0'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material3:material3"
Expand Down
4 changes: 2 additions & 2 deletions 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.01.01')
def composeBom = platform('androidx.compose:compose-bom:2026.02.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -69,7 +69,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.13.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.10.0'
implementation 'androidx.activity:activity-compose:1.12.3'
implementation 'androidx.activity:activity-compose:1.12.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.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:9.0.0"
classpath "com.android.tools.build:gradle:9.0.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
Expand Down
6 changes: 3 additions & 3 deletions BasicStateCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ dependencies {
implementation("androidx.core:core-ktx:1.17.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0")
implementation("androidx.activity:activity-compose:1.12.3")
implementation(platform("androidx.compose:compose-bom:2026.01.01"))
implementation("androidx.activity:activity-compose:1.12.4")
implementation(platform("androidx.compose:compose-bom:2026.02.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.01.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2026.02.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:9.0.0'
classpath 'com.android.tools.build:gradle:9.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
}
Expand Down
1 change: 0 additions & 1 deletion BasicsCodelab/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
}

Expand Down
Loading
Loading