diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 47defc85b..1d496c71f 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -21,7 +21,7 @@ plugins { } android { - compileSdkVersion 34 + compileSdkVersion 35 namespace 'com.example.jetnews' defaultConfig { applicationId 'com.example.jetnews' @@ -70,7 +70,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -97,16 +97,16 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.activity:activity-ktx:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.activity:activity-compose:1.9.2" + implementation 'androidx.activity:activity-ktx:1.9.3' + implementation 'androidx.core:core-ktx:1.15.0' + implementation "androidx.activity:activity-compose:1.9.3" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" - implementation 'androidx.navigation:navigation-compose:2.8.1' + implementation 'androidx.navigation:navigation-compose:2.8.3' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 4628148b6..821b43b4e 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.6.1' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" } } diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/app/build.gradle.kts b/AdaptiveUiCodelab/app/build.gradle.kts index 98c7d90d6..f812dbe48 100644 --- a/AdaptiveUiCodelab/app/build.gradle.kts +++ b/AdaptiveUiCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.example.reply" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.example.reply" diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index f73009fee..3cb298648 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] -androidGradlePlugin = "8.6.1" -composeBom = "2024.09.02" -coreKtx = "1.13.1" -activityCompose = "1.9.2" +androidGradlePlugin = "8.7.2" +composeBom = "2024.10.01" +coreKtx = "1.15.0" +activityCompose = "1.9.3" espressoCore = "3.6.1" junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.0.20" kotlinxCoroutinesAndroid = "1.8.1" -lifecycle = "2.8.6" +lifecycle = "2.8.7" material3Adaptive = "1.0.0" -material3AdaptiveNavSuite = "1.3.0" +material3AdaptiveNavSuite = "1.3.1" window = "1.3.0" [libraries] diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 60936818b..2d7c25594 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -29,7 +29,7 @@ if (rootProject.file("local.properties").exists()) { } android { - compileSdkVersion 34 + compileSdkVersion 35 namespace "androidx.compose.samples.crane" defaultConfig { applicationId "androidx.compose.samples.crane" @@ -103,11 +103,11 @@ dependencies { } } - implementation "androidx.activity:activity-compose:1.9.2" + implementation "androidx.activity:activity-compose:1.9.3" implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.tracing:tracing:1.2.0" - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.compose.runtime:runtime" @@ -121,7 +121,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest" - def lifecycle_version = "2.8.6" + def lifecycle_version = "2.8.7" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 8a5144420..38222c52d 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.6.1" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "com.google.dagger:hilt-android-gradle-plugin:2.52" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 93f0dad78..dc4a0a570 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -21,7 +21,7 @@ plugins { } android { - compileSdk 34 + compileSdk 35 namespace "com.codelab.basiclayouts" defaultConfig { @@ -61,19 +61,19 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) - implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.core:core-ktx:1.15.0' implementation "androidx.compose.ui:ui" implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.material3:material3-window-size-class:1.3.0' + implementation 'androidx.compose.material3:material3-window-size-class:1.3.1' implementation "androidx.compose.material:material-icons-extended" implementation "androidx.compose.ui:ui-tooling-preview" implementation "com.google.android.material:material:1.12.0" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6' - implementation 'androidx.activity:activity-compose:1.9.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7' + implementation 'androidx.activity:activity-compose:1.9.3' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 1b9f29085..afd44c57a 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -19,7 +19,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:8.6.1" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index cdadd433b..6d9adb573 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose' android { - compileSdkVersion 34 + compileSdkVersion 35 namespace "com.google.samples.apps.sunflower" defaultConfig { applicationId "com.google.samples.apps.sunflower" @@ -60,26 +60,26 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) kapt "androidx.room:room-compiler:2.6.1" kapt "com.github.bumptech.glide:compiler:4.16.0" implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "androidx.core:core-ktx:1.13.1" - implementation "androidx.fragment:fragment-ktx:1.8.3" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.navigation:navigation-fragment-ktx:2.8.1" - implementation "androidx.navigation:navigation-ui-ktx:2.8.1" + implementation "androidx.constraintlayout:constraintlayout:2.2.0" + implementation "androidx.core:core-ktx:1.15.0" + implementation "androidx.fragment:fragment-ktx:1.8.5" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.navigation:navigation-fragment-ktx:2.8.3" + implementation "androidx.navigation:navigation-ui-ktx:2.8.3" implementation "androidx.recyclerview:recyclerview:1.3.2" implementation "androidx.room:room-runtime:2.6.1" implementation "androidx.room:room-ktx:2.6.1" implementation "androidx.tracing:tracing:1.2.0" implementation "androidx.viewpager2:viewpager2:1.1.0" - implementation "androidx.work:work-runtime-ktx:2.9.1" + implementation "androidx.work:work-runtime-ktx:2.10.0" implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.12.0" implementation "com.google.code.gson:gson:2.11.0" @@ -103,7 +103,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-intents:3.6.1" androidTestImplementation "androidx.test.ext:junit:1.2.1" androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0" - androidTestImplementation "androidx.work:work-testing:2.9.1" + androidTestImplementation "androidx.work:work-testing:2.10.0" androidTestImplementation "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:4.1.1" androidTestImplementation "com.google.truth:truth:1.4.4" androidTestImplementation "androidx.compose.ui:ui-test-junit4" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index dc930ba1e..0ee92b29f 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.1" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.1" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } } diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 1179d558f..9c0df39d3 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -21,7 +21,7 @@ plugins { } android { - compileSdkVersion 34 + compileSdkVersion 35 namespace "com.example.compose.rally" defaultConfig { @@ -81,12 +81,12 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) implementation "androidx.appcompat:appcompat:1.7.0" - implementation "androidx.core:core-ktx:1.13.1" + implementation "androidx.core:core-ktx:1.15.0" implementation "com.google.android.material:material:1.12.0" // Compose @@ -95,8 +95,8 @@ dependencies { implementation "androidx.compose.foundation:foundation" implementation "androidx.compose.material:material" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.activity:activity-compose:1.9.2" - implementation "androidx.navigation:navigation-compose:2.8.1" + implementation "androidx.activity:activity-compose:1.9.3" + implementation "androidx.navigation:navigation-compose:2.8.3" debugImplementation "androidx.compose.ui:ui-tooling" // Testing dependencies diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 8dc425e39..91309a0d8 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.1" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/app/build.gradle.kts b/PerformanceCodelab/app/build.gradle.kts index 18ba60b03..eb137841b 100644 --- a/PerformanceCodelab/app/build.gradle.kts +++ b/PerformanceCodelab/app/build.gradle.kts @@ -22,7 +22,7 @@ plugins { android { namespace = "com.compose.performance" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.compose.performance" @@ -92,7 +92,7 @@ dependencies { implementation(libs.androidx.tracing.ktx) // TODO Codelab task: Add androidx.runtime-tracing dependency to enable Composition Tracing - implementation("androidx.compose.runtime:runtime-tracing:1.0.0-beta01") + implementation("androidx.compose.runtime:runtime-tracing:1.7.5") implementation(libs.coil.compose) implementation(libs.androidx.media3.exoplayer) diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index 625bbc669..8bcc2f560 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] coil = "2.7.0" -com-android-application = "8.6.1" +com-android-application = "8.7.2" desugar_jdk_libs = "2.1.2" kotlinx-datetime = "0.6.1" -lifecycle-viewmodel-compose = "2.8.6" -material-icons-core = "1.7.2" +lifecycle-viewmodel-compose = "2.8.7" +material-icons-core = "1.7.5" media3 = "1.4.1" org-jetbrains-kotlin-android = "2.0.20" -core-ktx = "1.13.1" +core-ktx = "1.15.0" junit = "4.13.2" androidx-test-ext-junit = "1.2.1" espresso-core = "3.6.1" -lifecycle-runtime-ktx = "2.8.6" -activity-compose = "1.9.2" -compose-bom = "2024.09.02" -runtime-tracing = "1.0.0-beta01" +lifecycle-runtime-ktx = "2.8.7" +activity-compose = "1.9.3" +compose-bom = "2024.10.01" +runtime-tracing = "1.7.5" tracing-ktx = "1.3.0-alpha02" tracing-perfetto = "1.0.0" uiautomator = "2.3.0" -benchmark = "1.3.1" -androidx-baselineprofile = "1.3.1" -profileinstaller = "1.4.0" -material3 = "1.3.0" +benchmark = "1.3.3" +androidx-baselineprofile = "1.3.3" +profileinstaller = "1.4.1" +material3 = "1.3.1" spotless = "6.25.0" ktlint = "1.2.1" diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/measure/build.gradle.kts b/PerformanceCodelab/measure/build.gradle.kts index ce7f8fe87..efa81f8f1 100644 --- a/PerformanceCodelab/measure/build.gradle.kts +++ b/PerformanceCodelab/measure/build.gradle.kts @@ -23,7 +23,7 @@ plugins { android { namespace = "com.compose.performance.measure" - compileSdk = 34 + compileSdk = 35 compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 0aea4672a..e23139e0c 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -21,7 +21,7 @@ plugins { } android { - compileSdkVersion 34 + compileSdkVersion 35 namespace "com.example.compose.rally" defaultConfig { @@ -84,7 +84,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) androidTestImplementation(composeBom) diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 1491ae31f..425a23097 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -18,21 +18,21 @@ buildscript { // Define versions in a single place ext { // Sdk and tools - compileSdkVersion = 34 + compileSdkVersion = 35 minSdkVersion = 21 targetSdkVersion = 33 // App dependencies appCompatVersion = '1.7.0' - activityComposeVersion = '1.9.2' + activityComposeVersion = '1.9.3' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.6.1' - fragmentVersion = '1.8.3' + fragmentVersion = '1.8.5' junitVersion = '4.13.1' kotlinVersion = '2.0.20' ktlintVersion = '0.48.2' - ktxVersion = '1.13.1' + ktxVersion = '1.15.0' lifecycleVersion = '2.3.0' materialVersion = '1.12.0' runnerVersion = '1.0.1' @@ -48,7 +48,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.6.1" + classpath "com.android.tools.build:gradle:8.7.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 7053097e9..3774a0df1 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -22,7 +22,7 @@ plugins { android { namespace "com.example.reply" - compileSdk 34 + compileSdk 35 defaultConfig { applicationId 'com.example.reply' minSdkVersion 21 @@ -87,7 +87,7 @@ android { } dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.09.02') + def composeBom = platform('androidx.compose:compose-bom:2024.10.01') implementation(composeBom) testImplementation(composeBom) androidTestImplementation(composeBom) @@ -110,15 +110,15 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.activity:activity-ktx:1.9.2' - implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.activity:activity-compose:1.9.2" - - implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6" - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6" + implementation 'androidx.activity:activity-ktx:1.9.3' + implementation 'androidx.core:core-ktx:1.15.0' + implementation "androidx.activity:activity-compose:1.9.3" + + implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7" androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test:runner:1.6.2' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 8c882be95..72a42deed 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.6.1' + classpath 'com.android.tools.build:gradle:8.7.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20" } diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index 0aaefbcaf..df97d72b8 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-8.10.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME