diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 592897eb0..a8f38f418 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -103,24 +103,32 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         checkDependencies true
     }
 
     packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/README'
-        exclude 'META-INF/README.md'
-        exclude 'META-INF/CHANGES'
-        exclude 'LICENSE.txt'
-        exclude 'META-INF/*.kotlin_module'
-        exclude 'META-INF/*.version'
-        exclude 'kotlin/**'
-        exclude 'DebugProbesKt.bin'
+        jniLibs {
+            excludes += ['kotlin/**']
+        }
+
+        resources {
+            excludes += [
+                'META-INF/DEPENDENCIES',
+                'META-INF/LICENSE',
+                'META-INF/LICENSE.txt',
+                'META-INF/NOTICE',
+                'META-INF/NOTICE.txt',
+                'META-INF/README',
+                'META-INF/README.md',
+                'META-INF/CHANGES',
+                'LICENSE.txt',
+                'META-INF/*.kotlin_module',
+                'META-INF/*.version',
+                'kotlin/**',
+                'DebugProbesKt.bin'
+            ]
+        }
     }
 
     dependenciesInfo {
diff --git a/backend/webdav/src/main/AndroidManifest.xml b/backend/webdav/src/main/AndroidManifest.xml
deleted file mode 100644
index 7299b9e31..000000000
--- a/backend/webdav/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.backend.webdav" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16df90699..c866baf68 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 java = "1.8"
-androidGradlePlugin = "7.3.1"
+androidGradlePlugin = "7.4.0"
 ktlint = "0.44.0"
 
 kotlin = "1.7.22"