diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c590e2617..f4ccdbc84 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -26,6 +26,7 @@
+
@@ -2302,6 +2303,11 @@
+
+
+
+
+
@@ -2312,6 +2318,11 @@
+
+
+
+
+
@@ -2950,6 +2961,11 @@
+
+
+
+
+
@@ -2981,6 +2997,11 @@
+
+
+
+
+
@@ -3087,6 +3108,11 @@
+
+
+
+
+
@@ -3097,26 +3123,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3127,6 +3178,11 @@
+
+
+
+
+
@@ -3150,6 +3206,11 @@
+
+
+
+
+
@@ -3163,6 +3224,7 @@
+
@@ -3170,16 +3232,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..e6441136f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ce7dcdb42..b82aa23a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,12 +1,6 @@
-#
-# Nextcloud Talk - Android Client
-#
-# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2017 Mario Danic
-# SPDX-License-Identifier: GPL-3.0-or-later
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/wrapper/gradle-wrapper.properties.license b/gradle/wrapper/gradle-wrapper.properties.license
new file mode 100644
index 000000000..eb754075d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/gradlew b/gradlew
index 2fb10bd59..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -1,8 +1,5 @@
#!/bin/sh
-#
-# SPDX-FileCopyrightText: 2015-2021 the original author or authors.
-# SPDX-License-Identifier: Apache-2.0
#
# Copyright © 2015-2021 the original authors.
#
diff --git a/gradlew.bat b/gradlew.bat
index 517b1dc4f..7101f8e46 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,7 +1,4 @@
@rem
-@rem SPDX-FileCopyrightText: 2015 the original author or authors.
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/gradlew.bat.license b/gradlew.bat.license
new file mode 100644
index 000000000..d4790f0ff
--- /dev/null
+++ b/gradlew.bat.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 the original author or authors.
+SPDX-License-Identifier: Apache-2.0
diff --git a/gradlew.license b/gradlew.license
new file mode 100644
index 000000000..4523ac19e
--- /dev/null
+++ b/gradlew.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015-2021 the original author or authors.
+SPDX-License-Identifier: Apache-2.0
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 440046b6c..f93f51206 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
- Lint Report: 10 errors and 80 warnings
+ Lint Report: 10 errors and 81 warnings