diff --git a/app/build.gradle b/app/build.gradle
index db5acdd51..80e76dcd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,16 +96,12 @@ android {
             enableSplit = false
         }
     }
+
     dependenciesInfo {
         includeInApk false
         includeInBundle false
     }
-    // Can remove this once https://issuetracker.google.com/issues/260059413 is fixed.
-    // https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
+
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
             outputFileName = "Pachli_${variant.versionName}_${variant.versionCode}_${gitSha}_" +
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index faf24b90d..9a7183128 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.1.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.2)" variant="all" version="8.1.0">
+<issues format="6" by="lint 8.1.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.1)" variant="all" version="8.1.1">
 
     <issue
         id="InvalidPackage"
@@ -2203,7 +2203,7 @@
         errorLine2="                ~~~~~~~~~~~~~">
         <location
             file="src/main/java/app/pachli/components/accountlist/AccountListFragment.kt"
-            line="139"
+            line="135"
             column="17"/>
     </issue>
 
@@ -2478,7 +2478,7 @@
         errorLine2="                        ~~~~~~~">
         <location
             file="src/main/java/app/pachli/components/conversation/ConversationsFragment.kt"
-            line="155"
+            line="143"
             column="25"/>
     </issue>
 
@@ -2489,7 +2489,7 @@
         errorLine2="                                ~~~~~~~">
         <location
             file="src/main/java/app/pachli/components/conversation/ConversationsFragment.kt"
-            line="157"
+            line="145"
             column="33"/>
     </issue>
 
@@ -2566,7 +2566,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
             file="src/main/java/app/pachli/components/instancemute/fragment/InstanceListFragment.kt"
-            line="61"
+            line="57"
             column="21"/>
     </issue>
 
diff --git a/build.gradle b/build.gradle
index 8bc6e1c9a..8aab9c890 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,5 +19,5 @@ allprojects {
 }
 
 tasks.register('clean') {
-    delete rootProject.buildDir
+    delete layout.buildDirectory
 }
diff --git a/gradle.properties b/gradle.properties
index 84fe860c9..655b43027 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,3 @@ org.gradle.configuration-cache=true
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 android.useAndroidX=true
-
-# Upgrade lint to a newer version to work around https://issuetracker.google.com/issues/185418482.
-android.experimental.lint.version=8.1.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 96ea8f24d..07efeb74f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 aboutlibraries = "10.8.3"
-agp = "8.0.2"
+agp = "8.1.1"
 androidx-activity = "1.7.2"
 androidx-appcompat = "1.6.1"
 androidx-browser = "1.5.0"