gradle refactor

app/build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
-    id("csplashscreen.android.application")
-    id("csplashscreen.android.application.compose")
+    alias(libs.plugins.convention.application)
+    alias(libs.plugins.convention.application.compose)
 }
 
 dependencies {
     implementation(project(":core:core"))
     implementation(project(":core:ui"))
     implementation(project(":core:database"))
-    
+
     implementation(project(":core:collection"))
     implementation(project(":core:navigation"))
     implementation(project(":core:network"))

build-logic/dependencies/build.gradle.kts

@@ -5,9 +5,19 @@ plugins {
 group = "st.slex.csplashscreen.buildlogic"
 
 dependencies {
-    implementation(libs.android.gradlePlugin)
-    implementation(libs.kotlin.gradlePlugin)
-    implementation(libs.kotlin.serialization)
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.kotlin.serialization)
+    compileOnly(libs.ksp.gradlePlugin)
+    compileOnly(libs.room.gradlePlugin)
+    compileOnly(libs.android.tools.common)
+}
+
+tasks {
+    validatePlugins {
+        enableStricterValidation = true
+        failOnWarning = true
+    }
 }
 
 gradlePlugin {
@@ -28,5 +38,9 @@ gradlePlugin {
             id = "csplashscreen.android.library"
             implementationClass = "AndroidLibraryConventionPlugin"
         }
+        register("roomLibrary"){
+            id = "csplashscreen.room.library"
+            implementationClass = "RoomLibraryConventionPlugin"
+        }
     }
 }

build-logic/dependencies/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -2,6 +2,7 @@ import AppExt.currentLibs
 import AppExt.findVersionInt
 import AppExt.findVersionString
 import com.android.build.api.dsl.ApplicationExtension
+import com.google.devtools.ksp.gradle.KspExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -35,6 +36,10 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                     configureSigning(target)
                 }
             }
+
+            extensions.configure<KspExtension> {
+                arg("KOIN_CONFIG_CHECK", "true")
+            }
         }
     }
 }

build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -1,4 +1,5 @@
 import com.android.build.gradle.LibraryExtension
+import com.google.devtools.ksp.gradle.KspExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -36,6 +37,10 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 }
             }
 
+            extensions.configure<KspExtension> {
+                arg("KOIN_CONFIG_CHECK", "true")
+            }
+
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             configurations.configureEach {
                 resolutionStrategy {

build-logic/dependencies/src/main/kotlin/AppVersions.kt → build-logic/dependencies/src/main/kotlin/AppExt.kt

@@ -3,11 +3,6 @@ import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
 
-object AppVersions {
-    const val VERSION_NAME = "1.71"
-    const val VERSION_CODE = 17
-}
-
 object AppExt {
 
     /**

build-logic/dependencies/src/main/kotlin/RoomLibraryConventionPlugin.kt

@@ -0,0 +1,36 @@
+import AppExt.currentLibs
+import androidx.room.gradle.RoomExtension
+import com.google.devtools.ksp.gradle.KspExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+
+class RoomLibraryConventionPlugin : Plugin<Project> {
+
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("androidx.room")
+            pluginManager.apply("com.google.devtools.ksp")
+
+            extensions.configure<KspExtension> {
+                arg("room.generateKotlin", "true")
+            }
+
+            extensions.configure<RoomExtension> {
+                // The schemas directory contains a schema file for each version of the Room database.
+                // This is required to enable Room auto migrations.
+                // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
+                schemaDirectory("$projectDir/schemas")
+            }
+
+            dependencies {
+                "implementation"(currentLibs.findBundle("room").get())
+                "annotationProcessor"(currentLibs.findLibrary("androidx-room-compiler").get())
+                "implementation"(currentLibs.findLibrary("androidx-paging-runtime").get())
+                "androidTestApi"(currentLibs.findLibrary("androidx-room-testing").get())
+                "ksp"(currentLibs.findLibrary("androidx-room-compiler").get())
+            }
+        }
+    }
+}

build-logic/dependencies/src/main/kotlin/st.slex.csplashscreen/KotlinAndroid.kt

@@ -51,28 +51,14 @@ internal fun Project.configureKotlinAndroid(
     configureKotlin()
 
     dependencies {
-        add("coreLibraryDesugaring", libs.findLibrary("android-desugarJdkLibs").get())
-
-        val ktx = libs.findLibrary("androidx-core-ktx").get()
-        add("implementation", ktx)
-
-        val test = libs.findBundle("test").get()
-        add("testImplementation", test)
-
-        val androidTest = libs.findBundle("android-test").get()
-        add("androidTestImplementation", androidTest)
-
-        val immutableCollection = libs.findLibrary("kotlinx-collections-immutable").get()
-        add("implementation", immutableCollection)
-
-        val coroutines = libs.findLibrary("coroutines").get()
-        add("implementation", coroutines)
-
-        val koinBundle = libs.findBundle("koin").get()
-        add("implementation", koinBundle)
-
-        val koinKsp = libs.findLibrary("koin-ksp").get()
-        add("ksp", koinKsp)
+        "coreLibraryDesugaring"(libs.findLibrary("android-desugarJdkLibs").get())
+        "implementation"(libs.findLibrary("androidx-core-ktx").get())
+        "testImplementation"(libs.findBundle("test").get())
+        "androidTestImplementation"(libs.findBundle("android-test").get())
+        "implementation"(libs.findLibrary("kotlinx-collections-immutable").get())
+        "implementation"(libs.findLibrary("coroutines").get())
+        "implementation"(libs.findBundle("koin").get())
+        "ksp"(libs.findLibrary("koin-ksp").get())
     }
 }
 

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.library) apply false
     alias(libs.plugins.serialization)
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.room) apply false
 }
 
 buildscript {

core/database/build.gradle.kts

@@ -1,18 +1,10 @@
 plugins {
-    id("csplashscreen.android.library")
+    alias(libs.plugins.convention.library)
+    alias(libs.plugins.convention.room.library)
 }
 
 android.namespace = "st.slex.csplashscreen.core.database"
 
-ksp {
-    arg("room.schemaLocation", "$projectDir/schemas")
-}
-
 dependencies {
     implementation(project(":core:core"))
-    implementation(libs.bundles.room)
-    annotationProcessor(libs.androidx.room.compiler)
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.paging.runtime)
-    androidTestApi(libs.androidx.room.testing)
 }

core/database/src/main/java/st/slex/csplashscreen/core/database/AppDatabase.kt

@@ -25,9 +25,9 @@ import st.slex.csplashscreen.core.database.search.SearchEntity
 )
 abstract class AppDatabase : RoomDatabase() {
 
-    abstract val favouriteDao: FavouriteDao
+    abstract fun getFavouriteDao(): FavouriteDao
 
-    abstract val searchDao: SearchDao
+    abstract fun getSearchDao(): SearchDao
 
     @RenameColumn(
         tableName = "favourite_table",

core/database/src/main/java/st/slex/csplashscreen/core/database/di/ModuleCoreDatabase.kt

@@ -17,6 +17,6 @@ val moduleCoreDatabase = module {
             .build()
     }
 
-    single<SearchDao> { get<AppDatabase>().searchDao }
-    single<FavouriteDao> { get<AppDatabase>().favouriteDao }
+    single<SearchDao> { get<AppDatabase>().getSearchDao() }
+    single<FavouriteDao> { get<AppDatabase>().getFavouriteDao() }
 }

core/database/src/test/java/st/slex/csplashscreen/core/database/FavouriteDaoTest.kt

@@ -29,7 +29,7 @@ class FavouriteDaoTest {
         database = Room
             .databaseBuilder(context, AppDatabase::class.java, AppDatabase.NAME)
             .build()
-        dao = database.favouriteDao
+        dao = database.getFavouriteDao()
     }
 
     @Test

core/database/src/test/java/st/slex/csplashscreen/core/database/SearchDaoTest.kt

@@ -27,7 +27,7 @@ class SearchDaoTest {
         database = Room
             .databaseBuilder(context, AppDatabase::class.java, AppDatabase.NAME)
             .build()
-        dao = database.searchDao
+        dao = database.getSearchDao()
     }
 
     @Test

core/ui/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("csplashscreen.android.library")
-    id("csplashscreen.android.library.compose")
+    alias(libs.plugins.convention.library)
+    alias(libs.plugins.convention.library.compose)
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 androidDesugarJdkLibs = "2.0.4"
 kotlin = "1.9.23"
 androidGradlePlugin = "8.3.2"
+androidTools = "31.4.0"
 
 minSdk = "28"
 targetSdk = "34"
@@ -45,6 +46,9 @@ android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", versio
 android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
+ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
+room-gradlePlugin = { group = "androidx.room", name = "room-gradle-plugin", version.ref = "room" }
 
 kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "immutableCollection" }
 
@@ -123,6 +127,13 @@ serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref
 application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+room = { id = "androidx.room", version.ref = "room" }
+
+convention-application = { id = "csplashscreen.android.application", version = "1.0" }
+convention-application-compose = { id = "csplashscreen.android.application.compose", version = "1.0" }
+convention-library = { id = "csplashscreen.android.library", version = "1.0" }
+convention-library-compose = { id = "csplashscreen.android.library.compose", version = "1.0" }
+convention-room-library = { id = "csplashscreen.room.library", version = "1.0" }
 
 [bundles]
 lifecycle = [