update gradle and catalogs

Author: SmartToolFactory

Diff for: Tutorial1-1Basics/build.gradle.kts

@@ -70,7 +70,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.android)
 
     implementation(libs.androidx.appcompat)
-    implementation(libs.material.v1120)
+    implementation(libs.androidx.compose.material)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.activity.compose)

Diff for: Tutorial1-1Basics/src/main/res/values-night/themes.xml

@@ -1,14 +1,8 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
-    <style name="Theme.ComposeTutorials" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.ComposeTutorials" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@android:color/transparent</item>
         <!-- Customize your theme here. -->

Diff for: Tutorial1-1Basics/src/main/res/values/themes.xml

@@ -1,14 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.ComposeTutorials" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.ComposeTutorials" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar" tools:targetApi="o_mr1">true</item>

Diff for: Tutorial2-1Unit-Testing/build.gradle.kts

@@ -60,37 +60,36 @@ composeCompiler {
 dependencies {
 
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx.v284)
-    implementation(libs.androidx.activity.compose.v191)
-    implementation(platform(libs.androidx.compose.bom.v20240800))
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
     implementation(libs.ui.graphics)
     implementation(libs.ui.tooling.preview)
     implementation(libs.androidx.compose.material3.material3)
 
     // lifecycle
-    implementation(libs.androidx.lifecycle.runtime.ktx.v284)
-    implementation(libs.androidx.lifecycle.runtime.compose.v284)
+    implementation(libs.androidx.lifecycle.runtime)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
     // AndroidX Test - JVM testing
     testImplementation(libs.androidx.core.testing)
     //noinspection UseTomlInstead
     testImplementation("androidx.test:core-ktx:1.6.1")
-    testImplementation(libs.androidx.junit.v121)
+    testImplementation(libs.androidx.test.ext.junit)
 
     // JUnit 5
     testImplementation(libs.junit.vintage.engine)
     testImplementation(libs.junit.jupiter.api)
     testImplementation(libs.junit.jupiter.engine)
 
-    testImplementation(libs.kotlinx.coroutines.test.v181)
+    testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.kotlin.test)
     testImplementation(libs.mockk.android)
     testImplementation(libs.truth)
 
-    androidTestImplementation(libs.androidx.junit.v121)
-    androidTestImplementation(libs.androidx.espresso.core.v361)
-    androidTestImplementation(platform(libs.androidx.compose.bom.v20240800))
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)

Diff for: Tutorial2-2UI-Testing/build.gradle.kts

@@ -56,17 +56,17 @@ composeCompiler {
 dependencies {
 
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx.v284)
+    implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom.v20240800))
+    implementation(platform(libs.androidx.compose.bom))
     implementation(libs.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.material3)
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit.v121)
-    androidTestImplementation(libs.androidx.espresso.core.v361)
-    androidTestImplementation(platform(libs.androidx.compose.bom.v20240800))
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.ui.test.junit4)
     debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)

Diff for: Tutorial3-1Navigation/build.gradle.kts

@@ -62,8 +62,8 @@ dependencies {
     ksp(libs.hilt.compiler)
 
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit.v121)
-    androidTestImplementation(libs.androidx.espresso.core.v361)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     debugImplementation(libs.androidx.compose.ui.tooling)

Diff for: gradle/libs.versions.toml

@@ -5,53 +5,51 @@
 [versions]
 accompanist = "0.34.0"
 accompanistCoil = "0.6.2"
-activityCompose = "1.9.2"
+activityCompose = "1.9.3"
 androidGradlePlugin = "8.5.2"
-androidx-activity-compose = "1.9.2"
+androidx-activity-compose = "1.9.3"
 androidx-appcompat = "1.7.0"
-androidx-benchmark = "1.3.2"
-androidx-benchmark-junit4 = "1.3.2"
-androidx-compose-bom = "2024.09.03"
-androidx-compose-latest = "1.7.3"
+androidx-benchmark = "1.3.3"
+androidx-benchmark-junit4 = "1.3.3"
+androidx-compose-bom = "2024.10.00"
+androidx-compose-latest = "1.7.4"
 androidx-compose-material3 = "1.3.0"
 androidx-compose-material3-adaptive = "1.0.0"
-androidx-constraintlayout = "1.1.0-beta01"
+androidx-constraintlayout = "1.1.0-rc01"
 androidx-core-splashscreen = "1.0.1"
 androidx-corektx = "1.13.1"
 androidx-lifecycle-compose = "2.8.6"
 androidx-lifecycle-runtime-compose = "2.8.6"
-androidx-navigation = "2.8.2"
+androidx-navigation = "2.8.3"
 kotlinxSerializationJson = "1.6.3"
-kotlinxSerialization = "1.9.23"
-androidx-palette = "1.0.0"
+kotlinxSerialization = "2.0.20"
 androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
 androidx-test-ext-junit = "1.2.1"
 androidx-test-ext-truth = "1.6.0"
 androidx-window = "1.3.0"
 androidxHiltNavigationCompose = "1.2.0"
-coil = "2.6.0"
+coil = "2.7.0"
 # @keep
 compileSdk = "35"
-composeBom = "2024.09.02"
-constraintlayoutCompose = "1.1.0-beta01"
+composeBom = "2024.10.00"
 coreTesting = "2.2.0"
-coroutines = "1.8.1"
+coroutines = "1.9.0"
 espressoCore = "3.6.1"
 google-maps = "19.0.0"
 gradle-versions = "0.51.0"
 hilt = "2.52"
 # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 jdkDesugar = "2.1.2"
 junit = "4.13.2"
-junitJupiterApi = "5.9.0"
-junitJupiterEngine = "5.9.0"
+junitJupiterApi = "5.10.1"
+junitJupiterEngine = "5.10.1"
 junitVersion = "1.2.1"
-junitVintageEngine = "5.9.0"
-kotlin = "2.0.10"
-kotlinTest = "1.8.22"
-kotlinx_immutable = "1.8.1"
-kotlinxCoroutinesTest = "1.8.1"
+junitVintageEngine = "5.10.1"
+kotlin = "2.0.20"
+kotlinTest = "2.0.20"
+kotlinx_immutable = "1.9.0"
+kotlinxCoroutinesTest = "1.9.0"
 ksp = "2.0.20-1.0.25"
 lifecycleRuntimeCompose = "2.8.6"
 lifecycleRuntimeKtx = "2.8.6"
@@ -65,11 +63,10 @@ mockkAndroid = "1.13.2"
 modernstoragePhotopicker = "1.0.0-alpha06"
 okhttp = "4.12.0"
 roborazzi = "1.12.0"
-room = "2.6.1"
 secrets = "2.0.1"
 # @keep
 targetSdk = "35"
-truth = "1.1.3"
+truth = "1.4.2"
 version-catalog-update = "0.8.4"
 
 [libraries]
@@ -79,27 +76,20 @@ accompanist-glide = { module = "dev.chrisbanes.accompanist:accompanist-glide", v
 accompanist-picasso = { module = "dev.chrisbanes.accompanist:accompanist-picasso", version.ref = "accompanistCoil" }
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
-androidx-activity-compose-v191 = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" }
 androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" }
 androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose-latest" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
-androidx-compose-bom-v20240800 = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-latest" }
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose-latest" }
 androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
-androidx-compose-material3-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "androidx-compose-material3-adaptive" }
-androidx-compose-material3-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "androidx-compose-material3-adaptive" }
-androidx-compose-material3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "androidx-compose-material3-adaptive" }
-androidx-compose-material3-adaptive-navigationSuite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite", version.ref = "androidx-compose-material3" }
 androidx-compose-material3-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
-androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-latest" }
 androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" }
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
@@ -114,13 +104,9 @@ androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constr
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" }
 androidx-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "coreTesting" }
-androidx-espresso-core-v361 = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
-androidx-junit-v121 = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-compose" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
-androidx-lifecycle-runtime-compose-v284 = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" }
-androidx-lifecycle-runtime-ktx-v284 = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
 androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle-compose" }
@@ -130,16 +116,12 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
 androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
 androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
-androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette" }
-androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
-androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
-androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
 androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
-androidx-test-runner = "androidx.test:runner:1.5.2"
+androidx-test-runner = "androidx.test:runner:1.6.2"
 androidx-ui = { module = "androidx.compose.ui:ui" }
 androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
@@ -160,8 +142,6 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx_immutable" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_immutable" }
-kotlinx-coroutines-test-v181 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
-material-v1120 = { module = "com.google.android.material:material", version.ref = "materialVersion" }
 material3 = { module = "androidx.compose.material3:material3" }
 mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockkAndroid" }
 modernstorage-photopicker = { module = "com.google.modernstorage:modernstorage-photopicker", version.ref = "modernstoragePhotopicker" }