diff options
| author | Eric Chang <erichang@google.com> | 2023-12-14 15:11:34 -0800 |
|---|---|---|
| committer | Dagger Team <dagger-dev+copybara@google.com> | 2023-12-14 15:15:04 -0800 |
| commit | 8372c630821d298dc6c4f237d38e216ae3bdfb73 (patch) | |
| tree | 94fc3158941d2eadce9742d03df90059781333fe | |
| parent | 13d64c6ba2fb8c887cd924fe1a0cdeb90ea83779 (diff) | |
| download | dagger2-8372c630821d298dc6c4f237d38e216ae3bdfb73.tar.gz | |
Flip the default for explicitBindingConflictsWithInject to enabled.
RELNOTES=Flip the default for explicitBindingConflictsWithInject to enabled.
PiperOrigin-RevId: 591064440
| -rw-r--r-- | java/dagger/internal/codegen/compileroption/ProcessingEnvironmentCompilerOptions.java | 2 | ||||
| -rw-r--r-- | javatests/dagger/internal/codegen/DuplicateBindingsValidationTest.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/dagger/internal/codegen/compileroption/ProcessingEnvironmentCompilerOptions.java b/java/dagger/internal/codegen/compileroption/ProcessingEnvironmentCompilerOptions.java index 0fc9caad8..81380055a 100644 --- a/java/dagger/internal/codegen/compileroption/ProcessingEnvironmentCompilerOptions.java +++ b/java/dagger/internal/codegen/compileroption/ProcessingEnvironmentCompilerOptions.java @@ -404,7 +404,7 @@ public final class ProcessingEnvironmentCompilerOptions extends CompilerOptions * How to report that an explicit binding in a subcomponent conflicts with an {@code @Inject} * constructor used in an ancestor component. */ - EXPLICIT_BINDING_CONFLICTS_WITH_INJECT(WARNING, ERROR, NONE), + EXPLICIT_BINDING_CONFLICTS_WITH_INJECT(ERROR, WARNING, NONE), ; final ValidationType defaultType; diff --git a/javatests/dagger/internal/codegen/DuplicateBindingsValidationTest.java b/javatests/dagger/internal/codegen/DuplicateBindingsValidationTest.java index b45357cd6..c352a2810 100644 --- a/javatests/dagger/internal/codegen/DuplicateBindingsValidationTest.java +++ b/javatests/dagger/internal/codegen/DuplicateBindingsValidationTest.java @@ -1052,9 +1052,8 @@ public class DuplicateBindingsValidationTest { CompilerTests.daggerCompiler(foo, injected1, injected2, provided1, provided2) .compile( subject -> { - subject.hasErrorCount(0); - subject.hasWarningCount(1); - subject.hasWarningContaining( + subject.hasErrorCount(1); + subject.hasErrorContaining( message( "Foo is bound multiple times:", " @Inject Foo(Set<String>) [Injected1]", |