feat: added build-logic and refactor plugin

openMF · May 8, 2024 · c49478e · c49478e
1 parent fff8516
commit c49478e
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 364 deletions.
diff --git a/build-logic/convention/bin/main/AndroidApplicationConventionPlugin.kt b/build-logic/convention/bin/main/AndroidApplicationConventionPlugin.kt
@@ -16,7 +16,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
                 apply("mifos.android.lint")
-                apply("com.dropbox.dependency-guard")
             }
 
             extensions.configure<ApplicationExtension> {

diff --git a/build-logic/convention/bin/main/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/bin/main/AndroidApplicationFlavorsConventionPlugin.kt
diff --git a/build-logic/convention/bin/main/AndroidLibraryConventionPlugin.kt b/build-logic/convention/bin/main/AndroidLibraryConventionPlugin.kt
@@ -5,7 +5,6 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
-import org.mifos.configureFlavors
 import org.mifos.configureKotlinAndroid
 import org.mifos.configurePrintApksTask
 import org.mifos.disableUnnecessaryAndroidTests
@@ -24,7 +23,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 34
                 testOptions.animationsDisabled = true
-                configureFlavors(this)
                 // The resource prefix is derived from the module name,
                 // so resources inside ":core:module1" must be prefixed with "core_module1_"
                 resourcePrefix =

diff --git a/build-logic/convention/bin/main/org/mifos/AndroidCompose.kt b/build-logic/convention/bin/main/org/mifos/AndroidCompose.kt
@@ -28,6 +28,9 @@ internal fun Project.configureAndroidCompose(
             add("androidTestImplementation", platform(bom))
             add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
             add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.foundation").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.material3").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.material.iconsExtended").get())
         }
 
         testOptions {

diff --git a/build-logic/convention/bin/main/org/mifos/KotlinAndroid.kt b/build-logic/convention/bin/main/org/mifos/KotlinAndroid.kt
@@ -20,15 +20,14 @@ internal fun Project.configureKotlinAndroid(
         compileSdk = 34
 
         defaultConfig {
-            minSdk = 24
+            minSdk = 26
         }
 
         compileOptions {
             // Up to Java 11 APIs are available through desugaring
             // https://developer.android.com/studio/write/java11-minimal-support-table
             sourceCompatibility = JavaVersion.VERSION_17
             targetCompatibility = JavaVersion.VERSION_17
-            isCoreLibraryDesugaringEnabled = true
         }
     }
 

diff --git a/build-logic/convention/bin/main/org/mifos/MifosBuildType.kt b/build-logic/convention/bin/main/org/mifos/MifosBuildType.kt
diff --git a/build-logic/convention/bin/main/org/mifos/MifosFlavor.kt b/build-logic/convention/bin/main/org/mifos/MifosFlavor.kt
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -82,9 +82,5 @@ gradlePlugin {
             id = "mifos.jvm.library"
             implementationClass = "JvmLibraryConventionPlugin"
         }
-        register("androidFlavors") {
-            id = "mifos.android.application.flavors"
-            implementationClass = "AndroidApplicationFlavorsConventionPlugin"
-        }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -16,7 +16,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
                 apply("mifos.android.lint")
-                apply("com.dropbox.dependency-guard")
             }
 
             extensions.configure<ApplicationExtension> {

diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -5,7 +5,6 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
-import org.mifos.configureFlavors
 import org.mifos.configureKotlinAndroid
 import org.mifos.configurePrintApksTask
 import org.mifos.disableUnnecessaryAndroidTests
@@ -24,7 +23,6 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 34
                 testOptions.animationsDisabled = true
-                configureFlavors(this)
                 // The resource prefix is derived from the module name,
                 // so resources inside ":core:module1" must be prefixed with "core_module1_"
                 resourcePrefix =

diff --git a/build-logic/convention/src/main/kotlin/org/mifos/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/mifos/AndroidCompose.kt
@@ -28,6 +28,9 @@ internal fun Project.configureAndroidCompose(
             add("androidTestImplementation", platform(bom))
             add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
             add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.foundation").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.material3").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.material.iconsExtended").get())
         }
 
         testOptions {

diff --git a/build-logic/convention/src/main/kotlin/org/mifos/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/org/mifos/KotlinAndroid.kt
@@ -20,15 +20,14 @@ internal fun Project.configureKotlinAndroid(
         compileSdk = 34
 
         defaultConfig {
-            minSdk = 24
+            minSdk = 26
         }
 
         compileOptions {
             // Up to Java 11 APIs are available through desugaring
             // https://developer.android.com/studio/write/java11-minimal-support-table
             sourceCompatibility = JavaVersion.VERSION_17
             targetCompatibility = JavaVersion.VERSION_17
-            isCoreLibraryDesugaringEnabled = true
         }
     }
 

diff --git a/build-logic/convention/src/main/kotlin/org/mifos/MifosBuildType.kt b/build-logic/convention/src/main/kotlin/org/mifos/MifosBuildType.kt
diff --git a/build-logic/convention/src/main/kotlin/org/mifos/MifosFlavor.kt b/build-logic/convention/src/main/kotlin/org/mifos/MifosFlavor.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,4 +6,5 @@ plugins {
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.androidx.navigation) apply false
+    alias(libs.plugins.ksp) apply false
 }
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
-    alias(libs.plugins.android.library)
+    alias(libs.plugins.mifos.android.library.compose)
     alias(libs.plugins.kotlin.android)
-    id(libs.plugins.kotlin.kapt.get().pluginId)
 }
 
 android {
@@ -15,28 +14,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.8"
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
@@ -51,21 +33,6 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.test.espresso.core)
 
-    // Jetpack Compose
-//    implementation(libs.androidx.material)
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compiler)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.activity.compose)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.lifecycle.viewModelCompose)
-    implementation(libs.androidx.material.icons.extended)
-
     // coil
     implementation(libs.coil.kt.compose)
-
-    //DBFlow dependencies
-    kapt(libs.dbflow.processor)
-    implementation(libs.dbflow)
-    kapt(libs.github.dbflow.processor)
 }