diff --git a/android/app/build.gradle b/android/app/build.gradle
index dd4178c4e9..87c532b9d3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -23,11 +23,17 @@ android {
     namespace "com.zulip.flutter"
 
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+
+        // The use of desugar_jdk_libs causes warning noise at build time:
+        //   https://github.com/zulip/zulip-flutter/pull/887#issuecomment-2287653388
+        //   https://issuetracker.google.com/issues/294273986
+        // TODO(#351): Try removing core-library desugaring once we've
+        //   removed flutter_local_notifications.
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -97,4 +103,5 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 740bb746d3..0a5710a599 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -6,11 +6,11 @@ android.enableJetifier=true
 # Defining them here makes them available both in
 # settings.gradle and in the build.gradle files.
 
-agpVersion=8.1.4
+agpVersion=8.5.2
 
 # Generally update this to the version found in recent releases
 # of Android Studio, as listed in this table:
 #   https://kotlinlang.org/docs/releases.html#release-details
 # A helpful discussion is at:
 #   https://stackoverflow.com/a/74425347
-kotlinVersion=1.9.10
+kotlinVersion=2.0.10
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 07e42d573c..545935f33c 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -6,7 +6,7 @@
 #  the wrapper is the one from the new Gradle too.)
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME