diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7b926e030..26c19753e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
     alias(libs.plugins.aboutLibraries)
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 938d0da11..326fc1145 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.aboutLibraries) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.compose.compiler) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.ksp) apply false
 }
 
diff --git a/gradle.properties b/gradle.properties
index 88dfc4b57..62f81ddb2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
 android.enableJetifier=false
-android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.caching=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0be8e634..f97c3df77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,10 +13,10 @@ version-name = "2.0.13.1"
 # External SDK versions
 go_version = "1.25.5"
 
-aboutLibraries = "13.2.1"
+aboutLibraries = "14.0.0-a01"
 activity = "1.12.2"
 android-material = "1.13.0"
-android-gradle-plugin = "8.13.2"
+android-gradle-plugin = "9.0.0"
 compose-material3 = "1.4.0"
 compose-material-icons = "1.7.8"
 compose-ui = "1.10.1"
@@ -72,5 +72,4 @@ zxing-core = { module = "com.google.zxing:core", version.ref = "zxing-core" }
 aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutLibraries" }
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36e4933e1..6a38a8cea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/syncthing/build.gradle.kts b/syncthing/build.gradle.kts
index 802f277a5..80283c2ec 100644
--- a/syncthing/build.gradle.kts
+++ b/syncthing/build.gradle.kts
@@ -3,8 +3,8 @@ import java.io.File
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.process.ExecOperations
 
-inline fun <reified T> org.gradle.api.Project.service(): T =
-    (this as ProjectInternal).services.get(T::class.java)
+inline fun <reified T : Any> org.gradle.api.Project.service(): T =
+    (this as ProjectInternal).services.get(T::class.java) as T
 
 fun getGitOutput(execOps: ExecOperations, command: List<String>, workingDir: File): String {
     val output = ByteArrayOutputStream()