From 286396aebaaef56adf4c942534ac87a28f67e69d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 8 Dec 2022 19:19:07 +0100
Subject: [PATCH] Gradle : more cleaning on app module

---
 app/build.gradle.kts      | 24 +++++++++++-------------
 gradle/libs.versions.toml |  7 +++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 42fa413a3a..b336054c10 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,17 +1,15 @@
 plugins {
     id("io.element.android-compose-application")
     id("org.jetbrains.kotlin.android")
-    alias(libs.plugins.ksp) version "1.7.20-1.0.7"
+    alias(libs.plugins.ksp)
     id("com.google.firebase.appdistribution") version "3.0.2"
 }
 
 android {
     namespace = "io.element.android.x"
-    compileSdk = 33
 
     defaultConfig {
         applicationId = "io.element.android.x"
-        minSdk = 29
         targetSdk = 33
         versionCode = 1
         versionName = "1.0"
@@ -122,17 +120,17 @@ dependencies {
     implementation(project(":features:messages"))
 
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.0")
-    implementation("io.github.raamcosta.compose-destinations:animations-core:1.7.23-beta")
-    ksp("io.github.raamcosta.compose-destinations:ksp:1.7.23-beta")
+    implementation(libs.compose.destinations)
+    ksp(libs.compose.destinations.processor)
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
-    implementation("androidx.activity:activity-compose:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
-    implementation("io.coil-kt:coil:2.2.1")
-    implementation("com.jakewharton.timber:timber:5.0.1")
-    implementation("com.airbnb.android:mavericks-compose:3.0.1")
+    implementation(libs.androidx.corektx)
+    implementation(libs.androidx.lifecycle.runtime)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.coil)
+    implementation(libs.timber)
+    implementation(libs.mavericks.compose)
 
-    implementation("com.airbnb.android:showkase:1.0.0-beta14")
+    implementation(libs.showkase)
     ksp(libs.showkase.processor)
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 093616fcd1..a97005caaa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,6 +11,8 @@ corektx = "1.9.0"
 datastore = "1.0.0"
 constraintlayout = "2.1.4"
 recyclerview = "1.2.1"
+lifecycle = "2.5.1"
+activity_compose = "1.6.1"
 
 # Compose
 compose_compiler = "1.3.2"
@@ -57,6 +59,9 @@ androidx_datastore_preferences = { module = "androidx.datastore:datastore-prefer
 androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
 androidx_constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx_recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
+androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+androidx_lifecycle_viewmodel_compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "activity_compose" }
 
 androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
 androidx_compose_foundation = { group = "androidx.compose.foundation", name = "foundation" }
@@ -89,10 +94,12 @@ test_orchestrator = { module = "androidx.test:orchestrator", version.ref = "test
 
 mavericks_compose = { module = "com.airbnb.android:mavericks-compose", version.ref = "mavericks" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
+coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
 serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
 compose_destinations = { module = "io.github.raamcosta.compose-destinations:animations-core", version.ref = "compose_destinations" }
+compose_destinations_processor = {module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose_destinations"}
 showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
 showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }