Kapt to Ksp migration (#315)

Author: ShiftHackZ

.gitignore

@@ -135,4 +135,5 @@ crashlytics-build.properties
 jacoco.exec
 
 # Fastlane
-fastlane/report.xml
+fastlane/report.xml
+.kotlin

app/build.gradle.kts

@@ -79,7 +79,3 @@ dependencies {
     implementation(libs.shifthackz.catppuccin.legacy)
     implementation(libs.androidx.work.runtime)
 }
-
-kapt {
-    correctErrorTypes = true
-}

build-logic/convention/src/main/kotlin/ApplicationConventionPlugin.kt

@@ -15,7 +15,6 @@ class ApplicationConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
-                apply("org.jetbrains.kotlin.kapt")
                 apply("generic.jacoco")
                 apply("org.jetbrains.kotlin.plugin.serialization")
             }

build-logic/convention/src/main/kotlin/com/shifthackz/aisdv1/buildlogic/Android.kt

@@ -4,6 +4,7 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid(
@@ -43,8 +44,8 @@ internal fun Project.configureKotlinAndroid(
 
 private fun Project.configureKotlin() {
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_17.toString()
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 }

build.gradle.kts

@@ -4,4 +4,6 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.android) apply false
     alias(libs.plugins.jetbrains.kotlin.serialization) apply false
     alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.google.ksp) apply false
+    alias(libs.plugins.androidx.room) apply false
 }

gradle/libs.versions.toml

@@ -6,6 +6,7 @@ compileSdk = "34"
 minSdk = "24"
 agp = "8.6.1"
 kotlin = "2.0.20"
+ksp = "2.0.20-1.0.25"
 appcompat = "1.7.0"
 composeCompiler = "1.5.7"
 composeBom = "2024.08.00"
@@ -117,9 +118,10 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+androidx-room = { id = "androidx.room", version.ref = "room" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version = "unspecified" }
 jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 generic-flavors = { id = "generic.flavors", version = "unspecified" }
 generic-library = { id = "generic.library", version = "unspecified" }
 generic-baseline-profm = { id = "generic.baseline.profm", version = "unspecified" }

network/src/main/java/com/shifthackz/aisdv1/network/di/NetworkModule.kt

@@ -2,6 +2,7 @@ package com.shifthackz.aisdv1.network.di
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.google.gson.Strictness
 import com.shifthackz.aisdv1.network.api.automatic1111.Automatic1111RestApi
 import com.shifthackz.aisdv1.network.api.horde.HordeRestApi
 import com.shifthackz.aisdv1.network.api.huggingface.HuggingFaceApi
@@ -43,7 +44,11 @@ private const val HTTP_TIMEOUT = 10L
 
 val networkModule = module {
 
-    single<Gson> { GsonBuilder().setLenient().create() }
+    single<Gson> {
+        GsonBuilder()
+            .setStrictness(Strictness.LENIENT)
+            .create()
+    }
 
     single { RestAuthenticator(get()) }
 

storage/build.gradle.kts

@@ -1,19 +1,20 @@
 plugins {
     alias(libs.plugins.generic.library)
-    kotlin("kapt")
+    alias(libs.plugins.google.ksp)
+    alias(libs.plugins.androidx.room)
 }
 
 android {
     namespace = "com.shifthackz.aisdv1.storage"
     defaultConfig {
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-                arg("room.incremental", "true")
-                arg("room.expandProjection", "true")
-            }
+        ksp {
+            arg("room.incremental", "true")
+            arg("room.expandProjection", "true")
         }
     }
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
 }
 
 dependencies {
@@ -22,6 +23,5 @@ dependencies {
     implementation(libs.google.gson)
     implementation(libs.androidx.room.runtime)
     implementation(libs.androidx.room.rx)
-    //ToDo migrate to KSP
-    kapt(libs.androidx.room.compiler)
+    ksp(libs.androidx.room.compiler)
 }