Merge branch 'main' into main

app/build.gradle.kts

@@ -17,8 +17,7 @@
 plugins {
   id("com.android.application")
   id("kotlin-android")
-  id("kotlin-parcelize")
-  id("kotlin-kapt")
+  id("com.google.devtools.ksp")
   id("dagger.hilt.android.plugin")
 }
 
@@ -110,15 +109,13 @@ androidComponents {
 }
 
 dependencies {
-  kapt(libs.androidx.room.compiler)
-  kapt(libs.hilt.android.compiler)
-  implementation(libs.androidx.constraintlayout)
+  ksp(libs.androidx.room.compiler)
+  ksp(libs.hilt.android.compiler)
   implementation(libs.androidx.core.ktx)
   implementation(libs.androidx.lifecycle.livedata.ktx)
   implementation(libs.androidx.lifecycle.viewmodel.ktx)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
-  implementation(libs.androidx.paging.runtime.ktx)
   implementation(libs.androidx.room.ktx)
   implementation(libs.androidx.work.runtime.ktx)
   implementation(libs.material)
@@ -131,7 +128,6 @@ dependencies {
   implementation(libs.hilt.android)
   implementation(libs.hilt.navigation.compose)
   implementation(libs.androidx.profileinstaller)
-  implementation(libs.androidx.tracing.ktx)
 
   // Compose
   implementation(platform(libs.androidx.compose.bom))
@@ -152,7 +148,7 @@ dependencies {
 
   // Testing dependencies
   debugImplementation(libs.androidx.monitor)
-  kaptAndroidTest(libs.hilt.android.compiler)
+  kspAndroidTest(libs.hilt.android.compiler)
   androidTestImplementation(platform(libs.androidx.compose.bom))
   androidTestImplementation(libs.androidx.arch.core.testing)
   androidTestImplementation(libs.androidx.espresso.contrib)

build.gradle.kts

@@ -29,11 +29,12 @@ buildscript {
 
 plugins {
     id("com.diffplug.spotless") version "6.4.1"
+    id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false
 }
 
 spotless {
     kotlin {
         target("**/*.kt")
         ktlint(libs.versions.ktlint.get()).userData(mapOf("max_line_length" to "100"))
     }
-}
+}

gradle/libs.versions.toml

@@ -22,20 +22,19 @@ benchmark = "1.1.0"
 compileSdk = "33"
 composeLatest = "1.4.0-alpha03"
 composeBom = "2023.06.01"
-compose-compiler = "1.4.6"
+compose-compiler = "1.5.3"
 constraintLayoutCompose = "1.0.1"
-constraintLayout = "2.1.4"
 coreTesting = "2.2.0"
 coroutines = "1.6.4"
 espresso = "3.4.0"
 glide = "1.0.0-alpha.3"
 gradle = "7.2.0"
 gson = "2.9.0"
 guava = "31.1-android"
-hilt = "2.44.2"
+hilt = "2.48"
 hiltNavigationCompose = "1.0.0"
 junit = "4.13.2"
-kotlin = "1.8.20"
+kotlin = "1.9.10"
 ktlint = "0.40.0"
 ktx = "1.7.0"
 lifecycle = "2.6.0-alpha04"
@@ -46,7 +45,6 @@ minSdk = "23"
 monitor = "1.6.0"
 navigation = "2.5.3"
 okhttpLogging = "4.10.0"
-paging = "3.1.1"
 pagingCompose = "1.0.0-alpha18"
 profileInstaller = "1.2.0"
 recyclerView = "1.3.0-alpha02"
@@ -56,7 +54,6 @@ runner = "1.0.1"
 # @keep
 targetSdk = "33"
 testExtJunit = "1.1.5"
-tracing = "1.1.0"
 uiAutomator = "2.2.0"
 viewModelCompose = "2.5.1"
 work = "2.7.1"
@@ -80,7 +77,6 @@ androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
-androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintLayout" }
 androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintLayoutCompose" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "ktx" }
 androidx-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
@@ -92,14 +88,12 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view
 androidx-monitor = { module = "androidx.test:monitor", version.ref = "monitor" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "pagingCompose" }
-androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" }
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "profileInstaller" }
 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-ext-junit = { module = "androidx.test.ext:junit", version.ref = "testExtJunit" }
 androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" }
-androidx-tracing-ktx = { module = "androidx.tracing:tracing-ktx", version.ref = "tracing" }
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "work" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
 glide = { module = "com.github.bumptech.glide:compose", version.ref = "glide" }