diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
index 890de5b518bd..6b1621371b0b 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/DeckNode.kt
@@ -121,7 +121,7 @@ data class DeckNode(
         }
         if (node.level > 0 && startingLen == list.size) {
             // we don't include ourselves if no children matched
-            list.removeLast()
+            list.removeAt(list.lastIndex)
         }
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b38ba4b427e9..1adbd12723f4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ acra = '5.11.4'
 #
 # Old changelogs - See 'Table of Contents' in sidebar
 # https://developer.android.com/build/releases/past-releases
-androidGradlePlugin = "8.6.1"
+androidGradlePlugin = "8.7.0"
 # https://developer.android.com/jetpack/androidx/releases/activity
 androidxActivity = "1.9.2"
 # https://developer.android.com/jetpack/androidx/releases/annotation