Remove KAPT processors in hilt-compiler
Remove auto-service and gradle-incap-helper so that we don't use KAPT anymore.
Bug: 297052421
Test: ./gradlew :hilt:hilt-compiler:build
Change-Id: I6c3a21b891d5d59eb6bc944b0327cf49c620f5d7
diff --git a/hilt/hilt-compiler/build.gradle b/hilt/hilt-compiler/build.gradle
index 39dfec8..c5ea839 100644
--- a/hilt/hilt-compiler/build.gradle
+++ b/hilt/hilt-compiler/build.gradle
@@ -21,17 +21,12 @@
plugins {
id("AndroidXPlugin")
id("kotlin")
- id("kotlin-kapt")
}
androidx.configureAarAsJarForConfiguration("testImplementation")
dependencies {
implementation(libs.kotlinStdlib)
- compileOnly(libs.autoServiceAnnotations)
- kapt(libs.autoService)
- compileOnly(libs.gradleIncapHelper)
- kapt(libs.gradleIncapHelperProcessor)
implementation("androidx.room:room-compiler-processing:2.6.0-beta01")
implementation(libs.javapoet)
implementation(libs.kspApi)
diff --git a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltKspProcessor.kt b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltKspProcessor.kt
index 34a33f0..33f499b 100644
--- a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltKspProcessor.kt
+++ b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltKspProcessor.kt
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+package androidx.hilt
+
import androidx.hilt.work.WorkerStep
import androidx.room.compiler.processing.ksp.KspBasicAnnotationProcessor
-import com.google.auto.service.AutoService
import com.google.devtools.ksp.processing.SymbolProcessor
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
import com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -29,7 +30,6 @@
) {
override fun processingSteps() = listOf(WorkerStep())
- @AutoService(SymbolProcessorProvider::class)
class Provider : SymbolProcessorProvider {
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
return AndroidXHiltKspProcessor(environment)
diff --git a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltProcessor.kt b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltProcessor.kt
index 75f7f94..5c83b10 100644
--- a/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltProcessor.kt
+++ b/hilt/hilt-compiler/src/main/kotlin/androidx/hilt/AndroidXHiltProcessor.kt
@@ -18,17 +18,11 @@
import androidx.hilt.work.WorkerStep
import androidx.room.compiler.processing.javac.JavacBasicAnnotationProcessor
-import com.google.auto.service.AutoService
-import javax.annotation.processing.Processor
import javax.lang.model.SourceVersion
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessor
-import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType.ISOLATING
/**
* Annotation processor for the various AndroidX Hilt extensions.
*/
-@AutoService(Processor::class)
-@IncrementalAnnotationProcessor(ISOLATING)
class AndroidXHiltProcessor : JavacBasicAnnotationProcessor(
config = WorkerStep.ENV_CONFIG
) {
diff --git a/hilt/hilt-compiler/src/main/resources/META-INF/gradle/incremental.annotation.processors b/hilt/hilt-compiler/src/main/resources/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 0000000..77bb607
--- /dev/null
+++ b/hilt/hilt-compiler/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+androidx.hilt.AndroidXHiltProcessor,ISOLATING
diff --git a/hilt/hilt-compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/hilt/hilt-compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
new file mode 100644
index 0000000..4844cf3
--- /dev/null
+++ b/hilt/hilt-compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -0,0 +1 @@
+androidx.hilt.AndroidXHiltKspProcessor$Provider
diff --git a/hilt/hilt-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/hilt/hilt-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 0000000..46bece1
--- /dev/null
+++ b/hilt/hilt-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+androidx.hilt.AndroidXHiltProcessor
