diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties index c349fe239..668ebe53b 100644 --- a/.github/ci-gradle.properties +++ b/.github/ci-gradle.properties @@ -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 \ No newline at end of file +kotlin.incremental=false \ No newline at end of file diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index b5acbf912..7aed5553f 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -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) @@ -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" diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar and b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 79ea0b5cb..057ab19fe 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -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" diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar and b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 47a4f0cd5..cd34d5a0c 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -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" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 66efce77d..3240164fd 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -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 { diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar and b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 37c69b8d3..2acd24fe3 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -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' diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar b/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar and b/AnimationCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 37c69b8d3..2acd24fe3 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -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' diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index df9faa3ba..dfa3790e8 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -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) diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index f929ed4ae..5b9646203 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -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") @@ -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") diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/BasicsCodelab/gradle/libs.versions.toml b/BasicsCodelab/gradle/libs.versions.toml index 921c64218..96e3f2ecc 100644 --- a/BasicsCodelab/gradle/libs.versions.toml +++ b/BasicsCodelab/gradle/libs.versions.toml @@ -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" } diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar b/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar and b/BasicsCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 7e8b8a87a..2e51c6e0e 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -56,17 +56,17 @@ 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" @@ -74,7 +74,7 @@ dependencies { 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" diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar and b/MigrationCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index dcaf30c29..cbae10642 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -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" diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar and b/NavigationCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index d8e53fa76..2cba09397 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -5,7 +5,7 @@ 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" @@ -13,13 +13,13 @@ 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" diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar and b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 0eae4e125..69ddfa654 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -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" diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/TestingCodelab/gradle/wrapper/gradle-wrapper.jar and b/TestingCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 4309c3950..13130dfd1 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -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) @@ -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" diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar and b/ThemingCodelab/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index 98343ce80..9017fac75 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -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' diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar and b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties index a9db11550..69dd0d040 100644 --- a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties @@ -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