From e651294c2e68e7e5ca0e87e43d6d369b012ad2a6 Mon Sep 17 00:00:00 2001
From: Eric Chang <erichang@google.com>
Date: Mon, 11 Sep 2023 14:27:39 -0700
Subject: [PATCH] Fix Lint crash with AGP 8.1.0. See
 https://github.com/google/dagger/pull/4023/files#r1308159525 for details.

Fixes #3980.

RELNOTES=Fixes #3980.
PiperOrigin-RevId: 564502143
---
 java/dagger/lint/DaggerKotlinIssueDetector.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/dagger/lint/DaggerKotlinIssueDetector.kt b/java/dagger/lint/DaggerKotlinIssueDetector.kt
index 8ca862309e6..6a4a33ca62f 100644
--- a/java/dagger/lint/DaggerKotlinIssueDetector.kt
+++ b/java/dagger/lint/DaggerKotlinIssueDetector.kt
@@ -204,7 +204,8 @@ class DaggerKotlinIssueDetector : Detector(), SourceCodeScanner {
         ) {
           val containingClass = node.containingClass?.toUElement(UClass::class.java) ?: return
           if (containingClass.isObject()) {
-            val annotation = node.findAnnotation(JVM_STATIC_ANNOTATION)!!
+            val annotation = node.findAnnotation(JVM_STATIC_ANNOTATION)
+              ?: node.javaPsi.modifierList.findAnnotation(JVM_STATIC_ANNOTATION)!!
             context.report(
               ISSUE_JVM_STATIC_PROVIDES_IN_OBJECT,
               context.getLocation(annotation),