Skip to content

Commit

Permalink
Remove workaround for b/269172737.
Browse files Browse the repository at this point in the history
The bug in b/269172737 required us to have the scope annotation in a certain order to avoid KSP returning error types. However, it appears this ordering is no longer required with the latest Kotlin 1.9.0 and KSP 1.9.0-1.0.12.

RELNOTES=N/A
PiperOrigin-RevId: 559898050
  • Loading branch information
bcorso authored and Dagger Team committed Aug 24, 2023
1 parent 7107431 commit 046baa4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
* the classpath. In most cases, Dagger shouldn't care that the annotation isn't on the classpath
*/
// TODO(b/219587431): Support @MyTransitiveAnnotation (Requires generating metadata).
@MySubcomponentScope // TODO(b/269172737): Fix issue that requires reordering to build successfully.
@MyAnnotation(MyTransitiveType.VALUE)
@MyOtherAnnotation(MyTransitiveType.class)
@MySubcomponentScope
@Subcomponent(modules = MySubcomponentModule.class)
public abstract class MySubcomponentWithBuilder {
@MyQualifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
* the classpath. In most cases, Dagger shouldn't care that the annotation isn't on the classpath
*/
// TODO(b/219587431): Support @MyTransitiveAnnotation (Requires generating metadata).
@MySubcomponentScope // TODO(b/269172737): Fix issue that requires reordering to build successfully.
@MyAnnotation(MyTransitiveType.VALUE)
@MyOtherAnnotation(MyTransitiveType.class)
@MySubcomponentScope
@Subcomponent(modules = MySubcomponentModule.class)
public abstract class MySubcomponentWithFactory {
// TODO(b/219587431): Support @MyTransitiveAnnotation (Requires generating metadata).
Expand Down

0 comments on commit 046baa4

Please sign in to comment.