From c59255502db712cb3135761c3570a77a80c09717 Mon Sep 17 00:00:00 2001
From: Mustafa Ozhan <mr.mustafa.ozhan@gmail.com>
Date: Sun, 19 May 2024 10:04:23 +0200
Subject: [PATCH] [Oztechan/TraceFit#136] Remove android compose dependencies

---
 android/android.gradle.kts | 10 ++++++----
 gradle/libs.versions.toml  |  8 ++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android/android.gradle.kts b/android/android.gradle.kts
index a388416..a6398b1 100644
--- a/android/android.gradle.kts
+++ b/android/android.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     libs.plugins.apply {
         alias(androidApplication)
         alias(kotlinAndroid)
+        alias(jetbrainsCompose)
     }
 }
 
@@ -34,11 +35,12 @@ android {
 dependencies {
     implementation(project(":client"))
 
+    compose.apply {
+        implementation(ui)
+        implementation(preview)
+        debugImplementation(uiTooling)
+    }
     libs.android.apply {
-        implementation(composeUi)
-        implementation(composeUiToolingPreview)
         implementation(activityCompose)
-
-        debugImplementation(composeUiTooling)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc78616..bb4d536 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,11 +2,10 @@
 kotlin = "1.9.23"
 detekt = "1.23.6"
 kover = "0.6.1"
-compose = "1.6.7"
 jetbrainsCompose = "1.6.2"
 composeCompiler = "1.5.13"
 androidGradlePlugin = "8.4.0"
-androidx-activityCompose = "1.9.0"
+activityCompose = "1.9.0"
 
 [libraries]
 # COMMON
@@ -15,10 +14,7 @@ common-ComposeCompiler = { module = "androidx.compose.compiler:compiler", versio
 common-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 
 # ANDROID
-android-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-android-composeUi = { module = "androidx.compose.ui:ui", version.ref = "compose" }
-android-composeUiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-android-composeUiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
+android-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }