diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1fd8d060..9cf461f6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,13 +5,13 @@ jdk = "22"
 # lint checks must target JDK 17, but the runtime should remain 11
 lintJvmTarget = "17"
 runtimeJvmTarget = "11"
-lint = "31.8.0-alpha07"
+lint = "31.9.0-alpha05"
 
 [plugins]
 buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.1" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.7" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
-lint = { id = "com.android.lint", version = "8.8.0-alpha09" }
+lint = { id = "com.android.lint", version = "8.9.0-alpha05" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.29" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
diff --git a/slack-lint-checks/lint-baseline.xml b/slack-lint-checks/lint-baseline.xml
index 38562ebc..c82b2176 100644
--- a/slack-lint-checks/lint-baseline.xml
+++ b/slack-lint-checks/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-beta01)" variant="all" version="8.5.0-beta01">
+<issues format="6" by="lint 8.9.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.9.0-alpha05)" variant="all" version="8.9.0-alpha05">
 
     <issue
         id="LintDocExample"
@@ -118,7 +118,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/slack/lint/DoNotCallProvidersDetector.kt"
-            line="42"
+            line="27"
             column="10"/>
     </issue>
 
@@ -228,7 +228,7 @@
         errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/slack/lint/resources/FullyQualifiedResourceDetector.kt"
-            line="150"
+            line="152"
             column="12"/>
     </issue>
 
@@ -239,7 +239,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/slack/lint/resources/FullyQualifiedResourceDetector.kt"
-            line="152"
+            line="154"
             column="14"/>
     </issue>
 
@@ -250,7 +250,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/slack/lint/resources/FullyQualifiedResourceDetector.kt"
-            line="154"
+            line="156"
             column="14"/>
     </issue>
 
@@ -448,7 +448,7 @@
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/java/slack/lint/retrofit/RetrofitUsageDetector.kt"
-            line="155"
+            line="176"
             column="10"/>
     </issue>
 
@@ -540,138 +540,6 @@
             column="38"/>
     </issue>
 
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="90"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `java()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="140"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="210"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `java()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="271"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `java()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="327"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="377"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `java()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="462"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `java()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/FragmentDaggerFieldInjectionDetectorTest.kt"
-            line="512"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/MainScopeUsageDetectorTest.kt"
-            line="47"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent(),"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/MainScopeUsageDetectorTest.kt"
-            line="90"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent()"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/RawDispatchersUsageDetectorTest.kt"
-            line="68"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="LintImplTrimIndent"
-        message="No need to call `.trimIndent()` in issue registration strings; they are already trimmed by indent by lint when displaying to users. Instead, call `.indented()` on the surrounding `kotlin()` test file construction"
-        errorLine1="              .trimIndent(),"
-        errorLine2="               ~~~~~~~~~~~~">
-        <location
-            file="src/test/java/slack/lint/RawDispatchersUsageDetectorTest.kt"
-            line="131"
-            column="16"/>
-    </issue>
-
     <issue
         id="LintImplUseUast"
         message="Don&apos;t call PsiField#getInitializer(); you must use UAST instead. If you don&apos;t have a UField call UastFacade.getInitializerBody(field)"