diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d73edfeb814499bf1b3f897c248d6a6c0a7ccf41..917a9b8d6c1c3277290e863eff5c2e818281ad71 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -119,8 +119,8 @@ dependencies { // Dependency Injection implementation(libs.dagger.core) - kapt(libs.dagger.compiler) - kapt(libs.dagger.processor) + ksp(libs.dagger.compiler) + ksp(libs.dagger.processor) implementation(libs.dagger.android.core) implementation(libs.dagger.android.support) diff --git a/build.gradle.kts b/build.gradle.kts index b0c13fd03f444714e1d219ce35cec1b785e5cf34..a66882dfff1ce7515ec5da805393dd60de00941b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,6 @@ buildscript { plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.jvm) apply false - alias(libs.plugins.kotlin.kapt) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.ksp) apply false } diff --git a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt index 6e035a976325eed6f9e1c06cfd058ff18764d299..26ea31548cf6716bcf21f8ef69b637a0ca78799f 100644 --- a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt +++ b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt @@ -4,20 +4,16 @@ import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.testing.Test import org.gradle.jvm.toolchain.JavaLanguageVersion -import org.gradle.jvm.toolchain.JavaToolchainService import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain class KotlinAndroidConvention : Plugin<Project> { override fun apply(target: Project) { with(target) { with(pluginManager) { apply("org.jetbrains.kotlin.android") - apply("org.jetbrains.kotlin.kapt") apply("com.google.devtools.ksp") apply("org.jetbrains.kotlin.plugin.serialization") } diff --git a/gradle/convention/src/main/kotlin/KotlinConvention.kt b/gradle/convention/src/main/kotlin/KotlinConvention.kt index 69aeb152f051ddec559995fbbd8523af7066b61b..378f59d7f509527e12e131938dbbd1aff284c56b 100644 --- a/gradle/convention/src/main/kotlin/KotlinConvention.kt +++ b/gradle/convention/src/main/kotlin/KotlinConvention.kt @@ -4,25 +4,16 @@ import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.testing.Test import org.gradle.jvm.toolchain.JavaLanguageVersion -import org.gradle.jvm.toolchain.JavaToolchainService import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.dependencies -import org.gradle.kotlin.dsl.getByType -import org.gradle.kotlin.dsl.kotlin import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.withType -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions -import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask -import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain class KotlinConvention : Plugin<Project> { override fun apply(target: Project) { with(target) { with(pluginManager) { apply("org.jetbrains.kotlin.jvm") - apply("org.jetbrains.kotlin.kapt") apply("com.google.devtools.ksp") apply("org.jetbrains.kotlin.plugin.serialization") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ade7b203c8c184a2073ef3479d16b26eacc728ad..8bd8b81ad832990f7fa93f8a9e780a77d68cfb91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidx-espresso = "3.6.1" androidx-lifecycle = "2.8.7" androidx-room = "2.6.1" androidx-test = "1.6.2" -dagger = "2.47" +dagger = "2.52" glide = "4.16.0" kotlin = "2.0.21" kotlinx-serialization = "1.7.3" @@ -98,6 +98,5 @@ android-application = { id = "com.android.application", version.ref = "android-g android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } android-test = { id = "com.android.test", version.ref = "android-gradle-plugin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }