diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 22:53:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 22:53:00 +0000 |
| commit | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (patch) | |
| tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java | |
| parent | 0cd6a8551365e02a1687415356215ba2061739cd (diff) | |
| parent | 5480a6c05f0c4727b3dd154709f40fdae8d8b4a2 (diff) | |
| download | dagger2-8630738d0a775a2f8e5bc09c437556bd75d8b620.tar.gz | |
Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751
Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef
Diffstat (limited to 'java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java')
| -rw-r--r-- | java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java b/java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java index 2be7d3861..04cb80f94 100644 --- a/java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java +++ b/java/dagger/internal/codegen/componentgenerator/ComponentImplementationBuilder.java @@ -16,6 +16,7 @@ package dagger.internal.codegen.componentgenerator; +import static com.google.auto.common.MoreElements.getLocalAndInheritedMethods; import static com.google.auto.common.MoreTypes.asDeclared; import static com.google.common.base.Preconditions.checkState; import static com.squareup.javapoet.MethodSpec.constructorBuilder; @@ -145,8 +146,7 @@ public final class ComponentImplementationBuilder { .map(ComponentCreatorImplementation::spec) .ifPresent(this::addCreatorClass); - elements - .getLocalAndInheritedMethods(graph.componentTypeElement()) + getLocalAndInheritedMethods(graph.componentTypeElement(), types, elements) .forEach(method -> componentImplementation.claimMethodName(method.getSimpleName())); addFactoryMethods(); @@ -495,7 +495,7 @@ public final class ComponentImplementationBuilder { private boolean canInstantiateAllRequirements() { return !Iterables.any( graph.componentRequirements(), - dependency -> dependency.requiresAPassedInstance(elements, metadataUtil)); + dependency -> dependency.requiresAPassedInstance(elements, types, metadataUtil)); } private void createSubcomponentFactoryMethod(ExecutableElement factoryMethod) { |