diff --git a/app/lint.xml b/app/lint.xml
index bee960359..b4fe722c4 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -42,6 +42,6 @@
         <ignore path="**/NumberPicker.java" />
     </issue>
     <!-- Ignore warning, let the AGP update manage the gradle version -->
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
+    <issue id="AndroidGradlePluginVersion,BidiSpoofing" severity="ignore" />
     <!-- lint-osmdroid.xml has specific suppressions, maintained separately -->
 </lint>
diff --git a/build.gradle b/build.gradle
index 2f00f7334..ee48449f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.2.1'
+        classpath 'com.android.tools.build:gradle:9.3.1'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index d6e77cb75..38e10d962 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,3 +20,7 @@ org.gradle.jvmargs=-Xmx4096m
 
 # Disable map (i.e. neither MapBox nor osmdroid is used)
 # org.runnerup.nomap=true
+
+# Disable warnings due to the way ant+ is consumed
+# Using flatDir should be avoided because it doesn't support any meta-data formats
+android.sync.suppressAgpWarnings=FLAT_DIR_REPOSITORY_USED
diff --git a/hrdevice/lint.xml b/hrdevice/lint.xml
index 0dd0c3c30..81cf69c6a 100644
--- a/hrdevice/lint.xml
+++ b/hrdevice/lint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <!-- Ignore warning, let the AGP update manage the gradle version -->
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
+    <issue id="AndroidGradlePluginVersion,BidiSpoofing" severity="ignore" />
 </lint>
diff --git a/wear/lint.xml b/wear/lint.xml
index 766d42fe2..c97da4005 100644
--- a/wear/lint.xml
+++ b/wear/lint.xml
@@ -33,5 +33,5 @@
     <issue id="AllowBackup" severity="ignore"/>
     <issue id="GradleCompatible" severity="warning"/>
     <!-- Ignore warning, let the AGP update manage the gradle version -->
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
+    <issue id="AndroidGradlePluginVersion,BidiSpoofing" severity="ignore" />
 </lint>
\ No newline at end of file