chore: Swap Kapt for KSP (#140)

Update to KSP as it seems like the Kapt annotation processor no longer cuts it
govuk-one-login · Dec 27, 2024 · f5b4382 · f5b4382
1 parent ce5ab5a
commit f5b4382
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -55,4 +55,5 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.ksp) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,6 +21,7 @@ mockito-android = "5.14.2" # https://github.com/mockito/mockito/releases
 mockito-kotlin = "5.4.0" # https://github.com/mockito/mockito-kotlin/releases
 # DI
 dagger = "2.54" # https://github.com/google/dagger/releases
+ksp = "2.1.0-1.0.29" # https://github.com/google/ksp/releases
 
 [libraries]
 # Gradle
@@ -58,3 +59,4 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-general" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp"}
diff --git a/modules/logging-api/build.gradle.kts b/modules/logging-api/build.gradle.kts
@@ -3,6 +3,7 @@ import uk.gov.pipelines.config.ApkConfig
 
 plugins {
     id("uk.gov.pipelines.android-lib-config")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -89,21 +90,13 @@ dependencies {
         testImplementation(dependency)
     }
 
-    listOf(
-        libs.hilt.compiler,
-    ).forEach {
-        kapt(it)
-        kaptTest(it)
-        kaptAndroidTest(it)
-    }
+    ksp(libs.hilt.compiler)
+    kspTest(libs.hilt.compiler)
+    kspAndroidTest(libs.hilt.compiler)
 
     androidTestUtil(libs.androidx.orchestrator)
 }
 
-kapt {
-    correctErrorTypes = true
-}
-
 mavenPublishingConfig {
     mavenConfigBlock {
         name.set(

diff --git a/modules/logging-impl/build.gradle.kts b/modules/logging-impl/build.gradle.kts
@@ -3,6 +3,7 @@ import uk.gov.pipelines.config.ApkConfig
 
 plugins {
     id("uk.gov.pipelines.android-lib-config")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -90,8 +91,9 @@ dependencies {
 
     androidTestUtil(libs.androidx.orchestrator)
     api(projects.modules.loggingApi)
-    kapt(libs.hilt.compiler)
-    kaptAndroidTest(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
+    kspTest(libs.hilt.compiler)
+    kspAndroidTest(libs.hilt.compiler)
 }
 
 mavenPublishingConfig {

diff --git a/modules/logging-testdouble/build.gradle.kts b/modules/logging-testdouble/build.gradle.kts
@@ -3,6 +3,7 @@ import uk.gov.pipelines.config.ApkConfig
 
 plugins {
     id("uk.gov.pipelines.android-lib-config")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -84,8 +85,9 @@ dependencies {
 
     androidTestUtil(libs.androidx.orchestrator)
     api(projects.modules.loggingApi)
-    kapt(libs.hilt.compiler)
-    kaptAndroidTest(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
+    kspTest(libs.hilt.compiler)
+    kspAndroidTest(libs.hilt.compiler)
 }
 
 mavenPublishingConfig {