kapt removal

mimoccc · May 20, 2024 · bfc12af · bfc12af
1 parent 562b742
commit bfc12af
Show file tree

Hide file tree

Showing 7 changed files with 480 additions and 25 deletions.
diff --git a/buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/DependencyHandlerScopeExt.kt b/buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/DependencyHandlerScopeExt.kt
@@ -18,7 +18,6 @@ private const val IMPLEMENTATION = "implementation"
 private const val DEBUG_IMPLEMENTATION = "debugImplementation"
 private const val ANDROID_TEST_IMPLEMENTATION = "androidTestImplementation"
 private const val TEST_IMPLEMENTATION = "testImplementation"
-private const val KAPT_IMPLEMENTATION = "kapt"
 private const val KSP_IMPLEMENTATION = "ksp"
 
 fun DependencyHandlerScope.implementation(
@@ -62,9 +61,3 @@ fun DependencyHandlerScope.ksp(
 ) {
     add(KSP_IMPLEMENTATION, dependency.get())
 }
-
-fun DependencyHandlerScope.kapt(
-    dependency: Provider<MinimalExternalModuleDependency>
-) {
-    add(KAPT_IMPLEMENTATION, dependency.get())
-}
diff --git a/buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/AppPlugin.kt b/buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/AppPlugin.kt
@@ -30,7 +30,6 @@ import org.mjdev.gradle.extensions.libs
 import org.mjdev.gradle.extensions.manifestPlaceholders
 import org.mjdev.gradle.extensions.implementation
 import org.mjdev.gradle.extensions.debugImplementation
-import org.mjdev.gradle.extensions.kapt
 import org.mjdev.gradle.extensions.testImplementation
 import org.mjdev.gradle.extensions.androidTestImplementation
 import org.mjdev.gradle.extensions.applicationId
@@ -69,7 +68,6 @@ class AppPlugin : BasePlugin() {
         fromBuildPropertiesFile(appConfig, AppConfig.configPropertiesFile)
         loadRootPropertiesFile(appConfig.versionPropertiesFile)
         applyPlugin(libs.plugins.android.application)
-        applyPlugin(libs.plugins.kotlin.kapt)
         applyPlugin(libs.plugins.kotlin.android)
         applyPlugin(libs.plugins.kotlin.parcelize)
         applyPlugin(libs.plugins.google.devtools.ksp)
@@ -109,7 +107,7 @@ class AppPlugin : BasePlugin() {
                 targetCompatibility = AppConfig.javaVersion
             }
             composeOptions {
-//                enableStrongSkippingMode = true
+                useLiveLiterals = true
             }
             defaultConfig {
                 applicationId = appConfig.namespace
@@ -343,9 +341,9 @@ class AppPlugin : BasePlugin() {
             implementation(libs.dagger.hilt.android)
             implementation(libs.androidx.compose.hilt.navigation)
             // dagger annotations
-            kapt(libs.dagger.compiler)
-            kapt(libs.dagger.android.processor)
-            kapt(libs.dagger.hilt.compiler)
+            ksp(libs.dagger.compiler)
+            ksp(libs.dagger.android.processor)
+            ksp(libs.dagger.hilt.compiler)
             implementation(libs.moshi)
             implementation(libs.moshi.retrofit.converter)
             ksp(libs.moshi.kotlin.codegen)

diff --git a/buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/LibPlugin.kt b/buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/LibPlugin.kt
@@ -26,7 +26,6 @@ import org.mjdev.gradle.extensions.extension
 import org.mjdev.gradle.extensions.libs
 import org.mjdev.gradle.extensions.implementation
 import org.mjdev.gradle.extensions.debugImplementation
-import org.mjdev.gradle.extensions.kapt
 import org.mjdev.gradle.extensions.testImplementation
 import org.mjdev.gradle.extensions.androidTestImplementation
 import org.mjdev.gradle.extensions.ksp
@@ -47,7 +46,6 @@ class LibPlugin : BasePlugin() {
         fromBuildPropertiesFile(libConfig, LibConfig.configPropertiesFile)
         loadRootPropertiesFile(libConfig.versionPropertiesFile)
         applyPlugin(libs.plugins.android.library)
-        applyPlugin(libs.plugins.kotlin.kapt)
         applyPlugin(libs.plugins.kotlin.android)
         applyPlugin(libs.plugins.kotlin.parcelize)
         applyPlugin(libs.plugins.google.devtools.ksp)
@@ -75,7 +73,7 @@ class LibPlugin : BasePlugin() {
                 buildConfig = LibConfig.buildConfigEnabled
             }
             composeOptions {
-//                enableStrongSkippingMode = true
+                useLiveLiterals = true
             }
             defaultConfig {
                 minSdk = LibConfig.minSdk
@@ -207,9 +205,9 @@ class LibPlugin : BasePlugin() {
             // dagger hilt
             implementation(libs.dagger.hilt.android)
             implementation(libs.androidx.compose.hilt.navigation)
-            kapt(libs.dagger.compiler)
-            kapt(libs.dagger.android.processor)
-            kapt(libs.dagger.hilt.compiler)
+            ksp(libs.dagger.compiler)
+            ksp(libs.dagger.android.processor)
+            ksp(libs.dagger.hilt.compiler)
             // moshi
             implementation(libs.moshi)
             implementation(libs.moshi.retrofit.converter)