From 259644aa558aa3d77555dfa3d35879f2af262a64 Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Mon, 12 Dec 2022 22:24:51 +0000
Subject: [PATCH] using conventions with their own versioning - removes android
 plugins and compose from the main app

---
 app/build.gradle          |  1 -
 gradle/libs.versions.toml | 21 ++-------------------
 settings.gradle           |  2 +-
 tools/conventions         |  2 +-
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 51e7d6f..b68fb93 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,6 @@ dependencies {
     implementation "chat-engine:matrix-chat-engine"
     implementation "chat-engine.matrix:store"
 
-    implementation libs.compose.ui
     implementation libs.ktor.android
     implementation libs.sqldelight.android
     implementation libs.matrix.olm
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 894a02b..dc56543 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,43 +3,26 @@ kotlin = "1.7.20"
 coroutines = "1.6.4"
 sqldelight = "1.5.4"
 ktor = "2.2.1"
-compose = "1.2.1"
-compose-compiler = "1.3.2"
-android-gp = "7.3.1"
 
 [plugins]
-
-android-application = { id = "com.android.application", version.ref = "android-gp" }
-android-library = { id = "com.android.library", version.ref = "android-gp" }
-android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.2" }
-
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.2" }
 sqldelight = { id = "com.squareup.sqldelight", version.ref = "sqldelight" }
 
 [libraries]
-
-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose" }
-compose-material-three = { group = "androidx.compose.material3", name = "material3", version = "1.0.1" }
-compose-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose" }
-compose-activity = { group = "androidx.activity", name = "activity-compose", version = "1.6.1" }
-compose-coil = { group = "io.coil-kt", name = "coil-compose", version = "2.2.2" }
-
 android-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version = "1.1.5" }
 
+compose-coil = { group = "io.coil-kt", name = "coil-compose", version = "2.2.2" }
 accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version = "0.28.0" }
 
 matrix-olm = { group = "org.matrix.android", name = "olm-sdk", version = "3.2.12" }
-
 unifiedpush = { group = "com.github.UnifiedPush", name = "android-connector", version = "2.1.1" }
 
 firebase-bom = { module = "com.google.firebase:firebase-bom", version = "31.1.1" }
 
 kotlin-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.4.1" }
-
 kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlin-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
diff --git a/settings.gradle b/settings.gradle
index 09c2f92..17580aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 pluginManagement {
+    includeBuild 'tools/conventions'
     repositories {
         gradlePluginPortal()
         google()
@@ -14,7 +15,6 @@ rootProject.name = "SmallTalk"
 
 includeBuild 'screen-state'
 includeBuild 'chat-engine'
-includeBuild 'tools/conventions'
 
 include ':app'
 
diff --git a/tools/conventions b/tools/conventions
index 22256bf..730feff 160000
--- a/tools/conventions
+++ b/tools/conventions
@@ -1 +1 @@
-Subproject commit 22256bffeb9f3723bf3d01b39825f344e41150dc
+Subproject commit 730feff287862141dc7e3924821f57027b6c312b