Merge remote-tracking branch 'origin/main' into kenken/pass_clock_to_…

…controll_time_in_preview
DroidKaigi · Sep 17, 2023 · d456d3f · d456d3f
2 parents 046fba6 + ae4742f
commit d456d3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/...ogic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpAndroidHiltPlugin.kt b/...ogic/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<Project> {
     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<Project> {
                     }
                 }
             }
-            extensions.configure<KaptExtension> {
-                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
@@ -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)
 }