From 95d5b42c9651d0d9f68518402fbf6ba4f3dce35a Mon Sep 17 00:00:00 2001 From: Dzmitry Rymarau Date: Thu, 7 Dec 2023 10:08:03 +0300 Subject: [PATCH] refactor: switch back to kapt Some issues with Dagger not picking up Wire-generated classes after update to Kotlin 1.9.2x --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- sample/build.gradle.kts | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8cdcecb75..94b8ddf74 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.dagger.hilt.android) apply false alias(libs.plugins.kotlin.jvm) apply false - alias(libs.plugins.ksp) apply false + alias(libs.plugins.kotlin.kapt) apply false } group = checkNotNull(property("group")) { "group == null." } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b4182db5..b1bce91cc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -75,8 +75,8 @@ android-library = { id = "com.android.library", version.ref = "android" } dagger-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } 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" } kotlinx-binarycompatibilityvalidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" } -ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } wire = { id = "com.squareup.wire", version.ref = "wire" } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 731811a92..e04804a62 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.pexip.sdk.kotlin.android") id("com.pexip.sdk.licensee") alias(libs.plugins.dagger.hilt.android) - alias(libs.plugins.ksp) + alias(libs.plugins.kotlin.kapt) alias(libs.plugins.wire) } @@ -35,6 +35,13 @@ android { } } +kapt { + correctErrorTypes = true + arguments { + arg("dagger.fastInit", "enabled") + } +} + wire { kotlin { } } @@ -57,7 +64,7 @@ dependencies { implementation(libs.accompanist.systemuicontroller) implementation(libs.coil.compose) implementation(libs.dagger.hilt.android.runtime) - ksp(libs.dagger.hilt.compiler) + kapt(libs.dagger.hilt.compiler) implementation(libs.minidns.android21) implementation(libs.okhttp.logginginterceptor) implementation(libs.workflow.core.jvm)