From f56ef7951804949b3d6785b2e6c15f7166daa86a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 27 Aug 2025 09:10:54 +0200 Subject: [PATCH] Revert "Try following KSP incremental best practices on `anvilcodegen` (#5205)" (#5233) This reverts commit 8986b25c0930c2aa118f387e5976d8e0209c5301. --- .../anvilcodegen/ContributesNodeProcessor.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt index 7b41c03158..2511e0008d 100644 --- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt +++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt @@ -28,7 +28,6 @@ import com.squareup.kotlinpoet.KModifier import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy import com.squareup.kotlinpoet.STAR import com.squareup.kotlinpoet.TypeSpec -import com.squareup.kotlinpoet.ksp.addOriginatingKSFile import com.squareup.kotlinpoet.ksp.toTypeName import com.squareup.kotlinpoet.ksp.writeTo import dagger.Binds @@ -79,7 +78,6 @@ class ContributesNodeProcessor( ) .addType( TypeSpec.classBuilder(moduleClassName) - .addOriginatingKSFile(ksClass.containingFile!!) .addModifiers(KModifier.ABSTRACT) .addAnnotation(Module::class) .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build()) @@ -104,7 +102,10 @@ class ContributesNodeProcessor( content.writeTo( codeGenerator = codeGenerator, - dependencies = Dependencies(aggregating = false), + dependencies = Dependencies( + aggregating = true, + ksClass.containingFile!! + ), ) } @@ -138,7 +139,6 @@ class ContributesNodeProcessor( val content = FileSpec.builder(generatedPackage, assistedFactoryClassName) .addType( TypeSpec.interfaceBuilder(assistedFactoryClassName) - .addOriginatingKSFile(ksClass.containingFile!!) .addSuperinterface(ClassName.bestGuess(assistedNodeFactoryFqName.asString()).parameterizedBy(nodeClassName)) .addAnnotation(AssistedFactory::class) .addFunction( @@ -155,7 +155,10 @@ class ContributesNodeProcessor( content.writeTo( codeGenerator = codeGenerator, - dependencies = Dependencies(aggregating = false), + dependencies = Dependencies( + aggregating = true, + ksClass.containingFile!! + ), ) }