switch to KSP for the Daggger & Hilt compilers

CruGlobal · Sep 15, 2023 · 0096353 · 0096353
1 parent c940428
commit 0096353
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 38 deletions.
diff --git a/feature/bundledcontent/build.gradle.kts b/feature/bundledcontent/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.dynamic-feature-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android.namespace = "org.cru.godtools.feature.bundledcontent"
@@ -12,5 +12,5 @@ dependencies {
 
     implementation(libs.dagger)
 
-    kapt(libs.dagger.compiler)
+    ksp(libs.dagger.compiler)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-compose-compiler = "1.5.3"
 androidx-compose-material = "1.5.1"
 androidx-compose-ui = "1.5.1"
 androidx-core = "1.12.0"
-androidx-hilt = "1.0.0"
+androidx-hilt = "1.1.0-alpha01"
 androidx-lifecycle = "2.6.2"
 androidx-room = "2.5.2"
 androidx-viewpager2 = "1.0.0"

diff --git a/library/account/build.gradle.kts b/library/account/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android.namespace = "org.cru.godtools.account"
@@ -25,8 +25,8 @@ dependencies {
     implementation(libs.play.auth)
     // endregion Google
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.kotlin.coroutines.test)

diff --git a/library/analytics/build.gradle.kts b/library/analytics/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -42,8 +42,8 @@ dependencies {
     implementation(libs.play.tagmanager)
     implementation(libs.weakdelegate)
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.kotlin.coroutines.test)

diff --git a/library/base/build.gradle.kts b/library/base/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android.namespace = "org.cru.godtools.base"
@@ -23,8 +23,9 @@ dependencies {
     implementation(libs.dagger)
     implementation(libs.hilt)
     implementation(libs.kotlin.coroutines)
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(libs.kotlin.coroutines.test)
     testImplementation(libs.turbine)

diff --git a/library/db/build.gradle.kts b/library/db/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
     alias(libs.plugins.ksp)
 }
 
@@ -37,10 +36,9 @@ dependencies {
     implementation(libs.dagger)
     implementation(libs.hilt)
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
-
     ksp(libs.androidx.room.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.androidx.room.testing)

diff --git a/library/download-manager/build.gradle.kts b/library/download-manager/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("godtools.library-conventions")
     kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -39,13 +40,13 @@ dependencies {
     implementation(libs.hilt)
     implementation(libs.kotlin.coroutines)
 
-    kapt(libs.androidx.hilt.compiler)
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.androidx.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(libs.androidx.arch.core.testing)
     testImplementation(libs.hilt.testing)
     testImplementation(libs.kotlin.coroutines.test)
     testImplementation(libs.turbine)
-    kaptTest(libs.hilt.compiler)
+    kspTest(libs.hilt.compiler)
 }
diff --git a/library/initial-content/build.gradle.kts b/library/initial-content/build.gradle.kts
@@ -2,7 +2,7 @@ import org.cru.godtools.gradle.bundledcontent.configureBundledContent
 
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -46,5 +46,5 @@ dependencies {
 
     testImplementation(libs.kotlin.coroutines.test)
 
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
 }
diff --git a/library/sync/build.gradle.kts b/library/sync/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android.namespace = "org.cru.godtools.sync"
@@ -27,7 +27,7 @@ dependencies {
 
     testImplementation(libs.kotlin.coroutines.test)
 
-    kapt(libs.androidx.hilt.compiler)
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.androidx.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 }
diff --git a/library/user-data/build.gradle.kts b/library/user-data/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
+    alias(libs.plugins.ksp)
 }
 
 android.namespace = "org.cru.godtools.user"
@@ -17,8 +17,8 @@ dependencies {
 
     implementation(libs.dagger)
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(kotlin("test"))
     testImplementation(libs.kotlin.coroutines.test)

diff --git a/ui/base/build.gradle.kts b/ui/base/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("godtools.library-conventions")
     kotlin("kapt")
     alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -50,8 +51,8 @@ dependencies {
     implementation(libs.hilt)
     implementation(libs.youtubePlayer)
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 
     testImplementation(project(":ui:tract-renderer"))
 }
diff --git a/ui/shortcuts/build.gradle.kts b/ui/shortcuts/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
     alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -36,7 +36,7 @@ dependencies {
     testImplementation(libs.gtoSupport.testing.timber)
     testImplementation(libs.kotlin.coroutines.test)
 
-    kapt(libs.androidx.hilt.compiler)
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.androidx.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 }
diff --git a/ui/tutorial-renderer/build.gradle.kts b/ui/tutorial-renderer/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("godtools.library-conventions")
-    kotlin("kapt")
     alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -46,6 +46,6 @@ dependencies {
     implementation(libs.splitties.intents)
     implementation(libs.youtubePlayer)
 
-    kapt(libs.dagger.compiler)
-    kapt(libs.hilt.compiler)
+    ksp(libs.dagger.compiler)
+    ksp(libs.hilt.compiler)
 }