diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 18c6ffa71..d1da6ebd8 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<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">
 
     <issue
         id="InvalidPackage"
@@ -2538,17 +2538,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            binding.scheduledDateTime.text = &quot;&quot;"
-        errorLine2="                                             ~~">
-        <location
-            file="src/main/java/app/pachli/components/compose/view/ComposeScheduleView.kt"
-            line="79"
-            column="46"/>
-    </issue>
-
     <issue
         id="RtlSymmetry"
         message="When you define `paddingStart` you should probably also define `paddingEnd` for right-to-left symmetry"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 648a53530..6a0fbcf75 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 aboutlibraries = "11.2.2"
 acra = "5.11.3"
-agp = "8.5.0"
+agp = "8.5.2"
 androidx-activity = "1.9.1"
 androidx-appcompat = "1.7.0"
 androidx-browser = "1.8.0"
@@ -56,7 +56,7 @@ kotlin-result = "1.1.20"
 ksp = "2.0.10-1.0.24"
 image-cropper = "4.3.2"
 leakcanary = "2.14"
-lint = "31.5.0" # = agp + 23.0.0 (= 8.5.0), see https://github.com/googlesamples/android-custom-lint-rules#lint-version
+lint = "31.5.2" # = agp + 23.0.0 (= 8.5.2), 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"