Continue cleaning gradle files

plugins/src/main/java/extension/CommonExtension.kt

@@ -2,9 +2,7 @@ package extension
 
 import Versions
 import com.android.build.api.dsl.CommonExtension
-import com.android.build.api.dsl.LibraryExtension
-import composeVersion
-import org.gradle.api.artifacts.VersionCatalog
+
 
 fun CommonExtension<*, *, *, *>.androidConfig() {
     defaultConfig {
@@ -39,13 +37,3 @@ fun CommonExtension<*, *, *, *>.composeConfig() {
     }
 }
 
-fun LibraryExtension.proguardConfig() {
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles("proguard-android.txt", "proguard-rules.pro")
-            consumerProguardFiles("proguard-rules.pro")
-        }
-    }
-}
-

plugins/src/main/java/extension/DependencyHandleScope.kt

@@ -1,23 +1,15 @@
-import extension.androidConfig
-import extension.composeConfig
-import extension.proguardConfig
+package extension
 
-plugins {
-    id("com.android.library")
-    id("kotlin-android")
-//    alias(libs.plugins.ksp)
-//    id("com.google.devtools.ksp") // version "1.7.20-1.0.7"
-}
+import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTestImplementation
+import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation
+import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation
+import org.gradle.kotlin.dsl.DependencyHandlerScope
 
-android {
-    androidConfig()
-    proguardConfig()
-    composeConfig()
-}
-
-dependencies {
-    implementation(platform("androidx.compose:compose-bom:2022.11.00"))
 
+fun DependencyHandlerScope.composeDependencies(){
+    val composeBom = platform("androidx.compose:compose-bom:2022.11.00")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.material:material")
     implementation("androidx.compose.material3:material3")
@@ -29,7 +21,6 @@ dependencies {
     implementation("com.airbnb.android:mavericks-compose:3.0.1")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
-
     implementation("com.airbnb.android:showkase:1.0.0-beta14")
-  //  ksp("com.airbnb.android:showkase-processor:1.0.0-beta14")
 }
+

plugins/src/main/java/extension/VersionCatalog.kt

@@ -0,0 +1,9 @@
+package extension
+
+import org.gradle.api.artifacts.VersionCatalog
+
+private fun VersionCatalog.getLibrary(library: String) = findLibrary(library).get()
+
+private fun VersionCatalog.getBundle(bundle: String) = findBundle(bundle).get()
+
+private fun VersionCatalog.getPlugin(plugin: String) = findPlugin(plugin).get()

plugins/src/main/java/io.element.android-compose-application.gradle.kts

@@ -0,0 +1,17 @@
+import extension.androidConfig
+import extension.composeConfig
+import extension.composeDependencies
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+android {
+    androidConfig()
+    composeConfig()
+}
+
+dependencies {
+    composeDependencies()
+}

plugins/src/main/java/io.element.android-compose-library.gradle.kts

@@ -0,0 +1,18 @@
+import extension.androidConfig
+import extension.composeConfig
+import extension.composeDependencies
+
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+
+
+android {
+    androidConfig()
+    composeConfig()
+}
+
+dependencies {
+    composeDependencies()
+}

plugins/src/main/java/io.element.android-library.gradle.kts

@@ -1,5 +1,4 @@
 import extension.androidConfig
-import extension.proguardConfig
 
 plugins {
     id("com.android.library")
@@ -8,5 +7,4 @@ plugins {
 
 android {
     androidConfig()
-    proguardConfig()
 }