diff --git a/build.gradle b/build.gradle
index 7a71abbf4e..ef621d43ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,10 +21,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.2.1'
+        classpath 'com.android.tools.build:gradle:9.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
-        classpath "com.android.legacy-kapt:com.android.legacy-kapt.gradle.plugin:9.2.1"
+        classpath "com.android.legacy-kapt:com.android.legacy-kapt.gradle.plugin:9.3.1"
         classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.9'
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:14.2.0"
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
index c365128a86..947b76bbe4 100644
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@@ -30,6 +30,48 @@ gMCLHCkQCVXefACdGAPMb9FOTnZvLttQb8sYxkt7QWQAoIBej+io4VD6SAGE0ur9
 =7AnO
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    80EF47E549604C05
+sub    FB867AED17DFFA48
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+P/6OIgVAOPssjDZqXWB23U8l82NL28CIfWt4
+=ULn9
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    81C27DE945332233
 sub    126BBD1EF340F4BD
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -3975,6 +4017,21 @@ mfMjMgP4QIPQl4W7IExkjfLxmiDnDUJ7XCfM
 =4S73
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    0A5DB758AC25D049
+uid    MapLibre Team <team@maplibre.org>
+
+sub    5D63C080CADABBC9
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEaRcOPBYJKwYBBAHaRw8BAQdAG0WSmkuZQgAwJFS9kDkQYMjtRwFUmgmlR6To
+k91qMV60IU1hcExpYnJlIFRlYW0gPHRlYW1AbWFwbGlicmUub3JnPs44BGkXDjwS
+CisGAQQBl1UBBQEBB0AQ+U0GuDAS0lXC1kaaOTu7QTenmKTSVHn944I8u4CvWwMB
+CAfCeAQYFgoAIBYhBB6wzqQtcsgaIca4Pwpdt1isJdBJBQJpFw48AhsMAAoJEApd
+t1isJdBJ4KoA/3phu9Mw5hBDCQPPp5Zaa9E4wYqUHaYl3AA6+j5HjAweAQCBAmW7
+DglWkcPKtwo2M6MXn6Es9vIFe38pc50BkIqHCA==
+=PINe
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    0C907617691418AE
 uid    Markus Junginger (artifact signing) <markus@greenrobot.de>
 
@@ -6031,6 +6088,21 @@ YyggQm1drySKnh1/Cfqokm6y/E7jlbpDM0BBiqzf7pVJoCV8+NxRYZqvZJOH1enC
 =LrUd
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub    530AA5F25C25011F
+uid    Gary Gregory <ggregory@apache.org>
+
+sub    7DFE92929805E309
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEaP9I0xYJKwYBBAHaRw8BAQdAOUBgNeJu8Xe4w2IE+22aMEiVvJRcY6Gwx8s/
+mfadmLq0IkdhcnkgR3JlZ29yeSA8Z2dyZWdvcnlAYXBhY2hlLm9yZz7OOARo/0jT
+EgorBgEEAZdVAQUBAQdAyPaT/8w88+/NA4o6ovcnWTqveOIhA3IIVYOlys0o7A8D
+AQgHwngEGBYKACAWIQT03VnJAUi9xSvrkKRTCqXyXCUBHwUCaP9I0wIbDAAKCRBT
+CqXyXCUBHySfAPwPXyiSs7i0yaZetG2b+UgRcTJ9mp2BSshgHyFHTHouJgD/WCbr
+Assv7MmNDjfS39AgWpkpr2dbNFIVY5cQlbXHNgo=
+=5yuW
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    55C7E5E701832382
 uid    Andrey Somov (SnakeYAML) <public.somov@gmail.com>
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 13555df282..190dfb81f3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -15,9 +15,6 @@
          <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
          <trust file="gradle-9.4.1-src.zip" regex="true" reason="Android Studio downloads gradle source zip but doesn't add checksums - fixes building in AS"/>
       </trusted-artifacts>
-      <ignored-keys>
-         <ignored-key id="0A5DB758AC25D049" reason="Key couldn't be downloaded from any key server"/>
-      </ignored-keys>
       <trusted-keys>
          <trusted-key id="02A36B6DB7056EB5E6FFEF893DA731F041734930" group="org.parceler"/>
          <trusted-key id="03C123038C20AAE9E286C857479D601F3A7B5C1A" group="com.github.ajalt.clikt"/>
@@ -22666,6 +22663,9 @@
          <artifact name="guava-33.4.0-android.jar">
             <sha256 value="e335cd1678426f15e04ae4f623c58b4c176572d7258c6ea64e3437cdc01e5707" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
+         <artifact name="guava-33.4.0-jre.module">
+            <sha256 value="820e817e86c493aa7affd6cbb991ee60925b6c8b74541f742cb22070f6f20459" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.google.guava" name="guava" version="33.4.8-jre">
          <artifact name="guava-33.4.8-android.jar">
@@ -25420,10 +25420,10 @@
       </component>
       <component group="jaxen" name="jaxen" version="2.0.6">
          <artifact name="jaxen-2.0.6.jar">
-            <sha256 value="3e2a755b283fd492fa4be204294c7abb7cd63ac94fb366baab9c7bb9afb00b6d" origin="Generated by Gradle"/>
+            <sha256 value="3e2a755b283fd492fa4be204294c7abb7cd63ac94fb366baab9c7bb9afb00b6d" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
          <artifact name="jaxen-2.0.6.pom">
-            <sha256 value="154da1400c3a405860ec3ae58e974c700033a646287c0bb6aa55c763871eb503" origin="Generated by Gradle"/>
+            <sha256 value="154da1400c3a405860ec3ae58e974c700033a646287c0bb6aa55c763871eb503" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
       <component group="jaxen" name="jaxen-parent" version="2.0.0">
@@ -25433,7 +25433,7 @@
       </component>
       <component group="jaxen" name="jaxen-parent" version="2.0.6">
          <artifact name="jaxen-parent-2.0.6.pom">
-            <sha256 value="21b45b6bdc6e8fc4c27f938ac111b1e86322c5627b79bb3e381f8ce72e64fe16" origin="Generated by Gradle"/>
+            <sha256 value="21b45b6bdc6e8fc4c27f938ac111b1e86322c5627b79bb3e381f8ce72e64fe16" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
          </artifact>
       </component>
       <component group="joda-time" name="joda-time" version="2.13.1">