diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpAndroidHiltPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpAndroidHiltPlugin.kt index f407afebc..6a28f860d 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpAndroidHiltPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpAndroidHiltPlugin.kt @@ -3,22 +3,20 @@ package io.github.droidkaigi.confsched2023.primitive import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.get -import org.jetbrains.kotlin.gradle.plugin.KaptExtension @Suppress("unused") class KmpAndroidHiltPlugin : Plugin { override fun apply(target: Project) { with(target) { with(pluginManager) { - apply("kotlin-kapt") + apply("com.google.devtools.ksp") apply("dagger.hilt.android.plugin") } kotlin { sourceSets.getByName("androidMain") { - val kaptConfiguration = configurations["kapt"] - kaptConfiguration.dependencies.add( + val kspConfiguration = configurations["kspAndroid"] + kspConfiguration.dependencies.add( libs.library("daggerHiltAndroidCompiler").let { DefaultExternalModuleDependency( it.module.group, @@ -34,9 +32,6 @@ class KmpAndroidHiltPlugin : Plugin { } } } - extensions.configure { - correctErrorTypes = true - } } } } diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KotlinGradleDsl.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KotlinGradleDsl.kt index ab4c2aa2b..99c756a2a 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KotlinGradleDsl.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KotlinGradleDsl.kt @@ -6,12 +6,6 @@ import org.gradle.api.plugins.ExtensionAware import org.gradle.kotlin.dsl.DependencyHandlerScope import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions -fun DependencyHandlerScope.kapt( - artifact: MinimalExternalModuleDependency, -) { - add("kapt", artifact) -} - fun TestedExtension.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { (this as ExtensionAware).extensions.configure("kotlinOptions", block) }