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
3 changes: 1 addition & 2 deletions .github/ci-gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx5120m
org.gradle.workers.max=2

kotlin.incremental=false
kotlin.compiler.execution.strategy=in-process
kotlin.incremental=false
4 changes: 2 additions & 2 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.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -112,7 +112,7 @@ dependencies {

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation "androidx.activity:activity-compose:1.13.0"
Expand Down
Binary file modified AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
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.3.1"
composeBom = "2026.06.01"
composeBom = "2026.08.00"
coreKtx = "1.19.0"
activityCompose = "1.13.0"
espressoCore = "3.7.0"
Expand Down
Binary file modified AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
6 changes: 3 additions & 3 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ dependencies {
}

implementation "androidx.activity:activity-compose:1.13.0"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.tracing:tracing:2.0.0"

def composeBom = platform('androidx.compose:compose-bom:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ buildscript {
classpath "com.android.tools.build:gradle:9.3.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.60.1"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.10"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.11"
}
}

plugins {
id 'com.diffplug.spotless' version '8.9.0'
id 'com.google.devtools.ksp' version '2.3.10' apply false
id 'com.google.devtools.ksp' version '2.3.11' apply false
}

subprojects {
Expand Down
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
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.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)

implementation 'androidx.activity:activity-compose:1.13.0'
Expand Down
Binary file modified AnimationCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
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.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
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.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand Down
Binary file modified BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
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.11.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0")
implementation("androidx.activity:activity-compose:1.13.0")
implementation(platform("androidx.compose:compose-bom:2026.06.01"))
implementation(platform("androidx.compose:compose-bom:2026.08.00"))
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.06.01"))
androidTestImplementation(platform("androidx.compose:compose-bom:2026.08.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
Expand Down
Binary file modified BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
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.11.0"
activityCompose = "1.13.0"
composeBom = "2026.06.01"
composeBom = "2026.08.00"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand Down
Binary file modified BasicsCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
8 changes: 4 additions & 4 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ android {
}

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

kapt "androidx.room:room-compiler:2.8.4"
kapt "com.github.bumptech.glide:compiler:5.0.9"
kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.constraintlayout:constraintlayout:2.2.2"
implementation "androidx.core:core-ktx:1.19.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.fragment:fragment-ktx:1.9.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.11.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0"
implementation "androidx.navigation:navigation-fragment-ktx:2.9.8"
implementation "androidx.navigation:navigation-ui-ktx:2.9.8"
implementation "androidx.recyclerview:recyclerview:1.4.0"
implementation "androidx.room:room-runtime:2.8.4"
implementation "androidx.room:room-ktx:2.8.4"
implementation "androidx.tracing:tracing:1.3.0"
implementation "androidx.tracing:tracing:2.0.0"
implementation "androidx.viewpager2:viewpager2:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.11.2"
implementation "com.github.bumptech.glide:glide:5.0.9"
Expand Down
Binary file modified MigrationCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "com.google.android.material:material:1.14.0"

Expand Down
Binary file modified NavigationCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ desugar_jdk_libs = "2.1.5"
kotlinx-datetime = "0.7.1-0.6.x-compat"
lifecycle-viewmodel-compose = "2.11.0"
material-icons-core = "1.7.8"
media3 = "1.10.1"
media3 = "1.11.0"
org-jetbrains-kotlin-android = "2.3.10"
core-ktx = "1.19.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.3.0"
espresso-core = "3.7.0"
lifecycle-runtime-ktx = "2.11.0"
activity-compose = "1.13.0"
compose-bom = "2026.06.01"
runtime-tracing = "1.11.4"
tracing-ktx = "1.3.0"
compose-bom = "2026.08.00"
runtime-tracing = "1.12.0"
tracing-ktx = "2.0.0"
tracing-perfetto = "1.0.1"
uiautomator = "2.4.0"
benchmark = "1.4.1"
androidx-baselineprofile = "1.5.0-beta01"
androidx-baselineprofile = "1.5.0-rc01"
profileinstaller = "1.4.1"
material3 = "1.4.0"
spotless = "8.9.0"
Expand Down
Binary file modified PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
6 changes: 3 additions & 3 deletions TestingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ android {
}

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

implementation "androidx.appcompat:appcompat:1.7.1"
implementation "androidx.appcompat:appcompat:1.8.0"
implementation "androidx.core:core-ktx:1.19.0"
implementation "com.google.android.material:material:1.14.0"
implementation "androidx.fragment:fragment-ktx:1.8.9"
implementation "androidx.fragment:fragment-ktx:1.9.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
Binary file modified TestingCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion TestingCodelab/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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/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.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -108,7 +108,7 @@ dependencies {

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"

implementation 'androidx.appcompat:appcompat:1.7.1'
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation "androidx.activity:activity-compose:1.13.0"
Expand Down
Binary file modified ThemingCodelab/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion ThemingCodelab/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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelabM2/app/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:2026.06.01')
def composeBom = platform('androidx.compose:compose-bom:2026.08.00')
implementation(composeBom)

implementation 'androidx.core:core-ktx:1.19.0'
Expand Down
Binary file modified ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Loading