diff --git a/feature/about/lint-baseline.xml b/feature/about/lint-baseline.xml
index 03c0924e0..795f3ee86 100644
--- a/feature/about/lint-baseline.xml
+++ b/feature/about/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.2)" variant="all" version="8.2.2">
+<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0)" variant="all" version="8.7.0">
 
 </issues>
diff --git a/feature/about/src/main/kotlin/app/pachli/feature/about/NotificationDetailsFragment.kt b/feature/about/src/main/kotlin/app/pachli/feature/about/NotificationDetailsFragment.kt
index c109e8b59..8a778724a 100644
--- a/feature/about/src/main/kotlin/app/pachli/feature/about/NotificationDetailsFragment.kt
+++ b/feature/about/src/main/kotlin/app/pachli/feature/about/NotificationDetailsFragment.kt
@@ -17,6 +17,7 @@
 
 package app.pachli.feature.about
 
+import android.annotation.SuppressLint
 import android.app.usage.UsageEvents
 import android.app.usage.UsageStatsManager.STANDBY_BUCKET_ACTIVE
 import android.app.usage.UsageStatsManager.STANDBY_BUCKET_FREQUENT
@@ -200,6 +201,7 @@ class WorkInfoAdapter : ListAdapter<WorkInfo, WorkInfoAdapter.ViewHolder>(diffCa
 
             if (runAttemptCount > 0 && state == WorkInfo.State.ENQUEUED) {
                 binding.stopReason.show()
+                @SuppressLint("SetTextI18n")
                 binding.stopReason.text = stopReason.toString()
             } else {
                 binding.stopReason.hide()
diff --git a/feature/login/lint-baseline.xml b/feature/login/lint-baseline.xml
index b3e37d65a..31424132c 100644
--- a/feature/login/lint-baseline.xml
+++ b/feature/login/lint-baseline.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.2)" variant="all" version="8.5.2">
+<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0)" variant="all" version="8.7.0">
+
+    <issue
+        id="MissingSuperCall"
+        message="Overriding method should call `super.onDestroy`"
+        errorLine1="    override fun onDestroy() {"
+        errorLine2="                 ~~~~~~~~~">
+        <location
+            file="src/main/kotlin/app/pachli/feature/login/LoginWebViewActivity.kt"
+            line="247"
+            column="18"/>
+    </issue>
 
     <issue
         id="StringFormatInvalid"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e4b188903..d555a2d34 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 aboutlibraries = "11.2.3"
 acra = "5.11.3"
-agp = "8.5.2"
+agp = "8.7.0"
 androidx-activity = "1.9.1"
 androidx-appcompat = "1.7.0"
 androidx-browser = "1.8.0"
@@ -51,7 +51,7 @@ kotlin-result = "1.1.20"
 ksp = "2.0.20-1.0.24"
 image-cropper = "4.3.2"
 leakcanary = "2.14"
-lint = "31.5.2" # = agp + 23.0.0 (= 8.5.2), see https://github.com/googlesamples/android-custom-lint-rules#lint-version
+lint = "31.7.0" # = agp + 23.0.0 (= 8.7.0), see https://github.com/googlesamples/android-custom-lint-rules#lint-version
 material = "1.12.0"
 material-drawer = "9.0.2"
 material-iconics = "5.5.0-compose01"