From 336e8cf2db01a6a8862d7cb9328bd6807f18e677 Mon Sep 17 00:00:00 2001 From: rey Date: Sat, 16 Sep 2023 12:12:17 +0900 Subject: [PATCH 1/2] Migrate dagger hilt from kapt to ksp. --- .../confsched2023/primitive/AndroidHiltPlugin.kt | 11 +++-------- .../confsched2023/primitive/KotlinGradleDsl.kt | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidHiltPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidHiltPlugin.kt index 89155d55f..4e66164c0 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidHiltPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidHiltPlugin.kt @@ -2,16 +2,14 @@ package io.github.droidkaigi.confsched2023.primitive import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies -import org.jetbrains.kotlin.gradle.plugin.KaptExtension @Suppress("unused") class AndroidHiltPlugin : Plugin { override fun apply(target: Project) { with(target) { with(pluginManager) { - apply("kotlin-kapt") + apply("com.google.devtools.ksp") apply("dagger.hilt.android.plugin") } @@ -26,12 +24,9 @@ class AndroidHiltPlugin : Plugin { implementation(libs.library("daggerHiltAndroid")) // https://issuetracker.google.com/issues/237567009 implementation(libs.library("androidxFragment")) - kapt(libs.library("daggerHiltAndroidCompiler")) + ksp(libs.library("daggerHiltAndroidCompiler")) testImplementation(libs.library("daggerHiltAndroidTesting")) - kaptTest(libs.library("daggerHiltAndroidTesting")) - } - extensions.configure { - correctErrorTypes = true + kspTest(libs.library("daggerHiltAndroidTesting")) } } } 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 106ce8e5c..ab4c2aa2b 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 @@ -22,8 +22,8 @@ fun DependencyHandlerScope.ksp( add("ksp", artifact) } -fun DependencyHandlerScope.kaptTest( +fun DependencyHandlerScope.kspTest( artifact: MinimalExternalModuleDependency, ) { - add("kaptTest", artifact) + add("kspTest", artifact) } From 2ae8f3f471fabc72db7e8f50f6dec8717b601286 Mon Sep 17 00:00:00 2001 From: rey Date: Sat, 16 Sep 2023 12:14:01 +0900 Subject: [PATCH 2/2] Remove. Because it is not need. --- .../confsched2023/primitive/AndroidFirebasePlugin.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidFirebasePlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidFirebasePlugin.kt index b3ef30c8e..a9fa2ef7c 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidFirebasePlugin.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/AndroidFirebasePlugin.kt @@ -2,9 +2,7 @@ package io.github.droidkaigi.confsched2023.primitive import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies -import org.jetbrains.kotlin.gradle.plugin.KaptExtension @Suppress("unused") class AndroidFirebasePlugin : Plugin { @@ -27,9 +25,6 @@ class AndroidFirebasePlugin : Plugin { implementation(libs.library("firebaseCommon")) implementation(libs.library("multiplatformFirebaseAuth")) } - extensions.configure { - correctErrorTypes = true - } } } }