diff --git a/build.gradle b/build.gradle
index da47ebc9e..12c4a6f2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.android_plugin_version = '8.4.0'
+    ext.android_plugin_version = '8.5.0'
     ext.kotlin_version = '1.9.22'
     ext.kotlinx_version = '1.7.1'
     repositories {
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 3edc8455e..daaaf6490 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -259,8 +259,8 @@ fi
 
 if [ ! -d "gradle/wrapper" ]; then
     diagnostic "Downloading gradle"
-    GRADLE_VERSION=8.6
-    GRADLE_SHA256=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+    GRADLE_VERSION=8.7
+    GRADLE_SHA256=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
     GRADLE_URL=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip
     wget ${GRADLE_URL} 2>/dev/null || curl -O ${GRADLE_URL} || fail "gradle: download failed"
     echo $GRADLE_SHA256 gradle-${GRADLE_VERSION}-bin.zip | sha256sum -c || fail "gradle: hash mismatch"
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index ac4731f33..4744ceec6 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 cache:
     paths:
         - .gradle/
-        - gradle-8.6/
+        - gradle-8.7/
         - gradle/
         - gradlew