Replace kapt with ksp

khoi-nguyen-2359 · Aug 23, 2024 · 514aad4 · 514aad4
1 parent 1246827
commit 514aad4
Show file tree

Hide file tree

Showing 28 changed files with 105 additions and 68 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'kotlin-kapt'
+    alias libs.plugins.ksp
     id 'kotlin-parcelize'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
@@ -11,7 +11,7 @@ plugins {
 
 android {
     namespace 'akio.apps.myrun'
-    compileSdkVersion project.compileSdk
+    compileSdk project.compileSdk
 
     defaultConfig {
         applicationId project.appId
@@ -131,7 +131,7 @@ dependencies {
 
     implementation(libs.dagger)
     implementation(libs.anvil.annotations)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)

diff --git a/base/di/build.gradle b/base/di/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    alias libs.plugins.ksp
 }
 
 android {
@@ -35,7 +35,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.timber)
 }
diff --git a/base/firebase/build.gradle b/base/firebase/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    alias libs.plugins.ksp
 }
 
 android {
@@ -36,7 +36,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation platform(libs.firebase.bom)
     implementation(libs.bundles.firebase.data)

diff --git a/base/firebase/src/main/java/akio/apps/myrun/base/firebase/FirebaseStorageUtils.kt b/base/firebase/src/main/java/akio/apps/myrun/base/firebase/FirebaseStorageUtils.kt
@@ -7,7 +7,7 @@ import java.io.ByteArrayOutputStream
 import kotlinx.coroutines.tasks.await
 
 object FirebaseStorageUtils {
-    suspend fun uploadBitmap(
+    private suspend fun uploadBitmap(
         storageRef: StorageReference,
         storeName: String,
         bitmap: Bitmap,

diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,6 @@ buildscript {
         classpath(libs.firebase.perf.plugin)
         classpath(libs.buildtimetracker)
         classpath(libs.kotlinserialization.plugin)
-        classpath(libs.anvil.plugin)
     }
 }
 

diff --git a/data/activity/build.gradle b/data/activity/build.gradle
@@ -1,9 +1,9 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
     id 'kotlinx-serialization'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -34,6 +34,13 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+        true, // contributesAndFactoryGeneration
+        true // componentMerging
+    )
+}
+
 dependencies {
     implementation(project(":data:api"))
     implementation(project(":base:di"))
@@ -48,7 +55,7 @@ dependencies {
     implementation(libs.tcxzpot)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.playservices.map)
     implementation(libs.googlemaps.androidutils)

diff --git a/data/activity/src/main/java/akio/apps/myrun/data/activity/di/ActivityDataComponent.kt b/data/activity/src/main/java/akio/apps/myrun/data/activity/di/ActivityDataComponent.kt
@@ -7,7 +7,6 @@ import akio.apps.myrun.data.activity.api.ActivityTcxFileWriter
 import android.app.Application
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import dagger.Component
 import javax.inject.Singleton
 
 abstract class ActivityDataScope private constructor()
@@ -22,7 +21,7 @@ interface ActivityDataComponent {
     fun activityRepository(): ActivityRepository
     fun activityTcxFileWriter(): ActivityTcxFileWriter
 
-    @Component.Factory
+    @MergeComponent.Factory
     interface Factory {
         fun create(@BindsInstance application: Application): ActivityDataComponent
     }

diff --git a/data/eapps/build.gradle b/data/eapps/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -32,6 +32,13 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+            true, // contributesAndFactoryGeneration
+            true, // componentMerging
+    )
+}
+
 dependencies {
     implementation project(':data:api')
 
@@ -43,7 +50,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.okhttp)
     implementation(libs.okhttplogger)

diff --git a/data/eapps/src/main/java/akio/apps/myrun/data/eapps/di/ExternalAppDataComponent.kt b/data/eapps/src/main/java/akio/apps/myrun/data/eapps/di/ExternalAppDataComponent.kt
@@ -8,7 +8,6 @@ import akio.apps.myrun.data.eapps.api.StravaTokenRepository
 import android.app.Application
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import dagger.Component
 import javax.inject.Singleton
 
 abstract class ExternalAppDataScope private constructor()
@@ -24,7 +23,7 @@ interface ExternalAppDataComponent {
     fun stravaSyncState(): StravaSyncState
     fun stravaTokenRepository(): StravaTokenRepository
 
-    @Component.Factory
+    @MergeComponent.Factory
     interface Factory {
         fun create(@BindsInstance application: Application): ExternalAppDataComponent
     }

diff --git a/data/location-mapbox/build.gradle b/data/location-mapbox/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    alias libs.plugins.ksp
 }
 
 android {
@@ -43,7 +43,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     testImplementation(libs.kotlintest)
 }
diff --git a/data/location/build.gradle b/data/location/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -44,6 +44,13 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+            true, // contributesAndFactoryGeneration
+            true, // componentMerging
+    )
+}
+
 dependencies {
     implementation(project(":data:api"))
     implementation(project(":base:di"))
@@ -60,7 +67,7 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.playservices.location)
 

diff --git a/data/location/src/main/java/akio/apps/myrun/data/location/di/LocationDataComponent.kt b/data/location/src/main/java/akio/apps/myrun/data/location/di/LocationDataComponent.kt
@@ -8,7 +8,6 @@ import akio.apps.myrun.data.location.api.SphericalUtil
 import android.app.Application
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import dagger.Component
 import javax.inject.Singleton
 
 abstract class LocationDataScope private constructor()
@@ -22,7 +21,7 @@ interface LocationDataComponent {
     fun polyUtil(): PolyUtil
     fun placeDataSource(): PlaceDataSource
 
-    @Component.Factory
+    @MergeComponent.Factory
     interface Factory {
         fun create(
             @BindsInstance application: Application,

diff --git a/data/route/build.gradle b/data/route/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -32,10 +32,17 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+            true, // contributesAndFactoryGeneration
+            true, // componentMerging
+    )
+}
+
 dependencies {
     implementation(project(":data:api"))
     implementation(project(":base:di"))
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 }
diff --git a/data/tracking/build.gradle b/data/tracking/build.gradle
@@ -1,9 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-//    id "com.google.devtools.ksp"
-    id 'kotlin-kapt'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -39,6 +38,13 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+            true, // contributesAndFactoryGeneration
+            true, // componentMerging
+    )
+}
+
 dependencies {
     implementation(project(":data:api"))
     implementation(project(":base:di"))
@@ -50,12 +56,12 @@ dependencies {
 
     implementation(libs.room.ktx)
     implementation(libs.room.runtime)
-    kapt(libs.room.compiler)
+    ksp(libs.room.compiler)
 
     implementation(libs.timber)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 
     implementation(libs.datastore)
 

diff --git a/data/tracking/src/main/java/akio/apps/myrun/data/tracking/di/TrackingDataComponent.kt b/data/tracking/src/main/java/akio/apps/myrun/data/tracking/di/TrackingDataComponent.kt
@@ -8,7 +8,6 @@ import akio.apps.myrun.data.tracking.api.RouteTrackingState
 import android.app.Application
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import dagger.Component
 import javax.inject.Singleton
 
 abstract class TrackingDataScope private constructor()
@@ -22,7 +21,7 @@ interface TrackingDataComponent {
     fun fitnessDataRepo(): FitnessDataRepository
     fun locationPresentConfig(): LocationPresentConfiguration
 
-    @Component.Factory
+    @MergeComponent.Factory
     interface Factory {
         fun create(@BindsInstance application: Application): TrackingDataComponent
     }

diff --git a/data/user/build.gradle b/data/user/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'com.squareup.anvil'
+    alias libs.plugins.ksp
+    alias libs.plugins.anvil
 }
 
 android {
@@ -33,6 +33,13 @@ android {
     }
 }
 
+anvil {
+    useKsp(
+            true, // contributesAndFactoryGeneration
+            true, // componentMerging
+    )
+}
+
 dependencies {
     implementation project(":data:api")
 
@@ -49,5 +56,5 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core)
 
     implementation(libs.dagger)
-    kapt(libs.daggercompiler)
+    ksp(libs.daggercompiler)
 }
diff --git a/.../user/src/main/java/akio/apps/myrun/data/authentication/di/AuthenticationDataComponent.kt b/.../user/src/main/java/akio/apps/myrun/data/authentication/di/AuthenticationDataComponent.kt
@@ -12,7 +12,6 @@ import akio.apps.myrun.data.user.api.UserRecentActivityRepository
 import android.app.Application
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
-import dagger.Component
 import javax.inject.Singleton
 
 abstract class AuthenticationDataScope private constructor()
@@ -32,7 +31,7 @@ interface AuthenticationDataComponent {
     fun userPreferences(): CurrentUserPreferences
     fun userPreferencesRepo(): UserPreferencesRepository
 
-    @Component.Factory
+    @MergeComponent.Factory
     interface Factory {
         fun create(@BindsInstance application: Application): AuthenticationDataComponent
     }