gradle: update to agp 9.1

The legacy kapt thing is a bummer. We'll need to move to ksp at some
point.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

build.gradle.kts

@@ -1,13 +1,5 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.kapt) apply false
-}
-
-tasks {
-    wrapper {
-        gradleVersion = "8.14"
-        distributionSha256Sum = "61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa"
-    }
+    alias(libs.plugins.legacy.kapt) apply false
 }

gradle.properties

@@ -22,27 +22,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Turn off AP discovery in compile path to enable compile avoidance
 kapt.include.compile.classpath=false
 
-# Experimental AGP flags
-# Generate compile-time only R class for app modules.
-android.enableAppCompileTimeRClass=true
-# Keep AAPT2 daemons alive between incremental builds.
-android.keepWorkerActionServicesBetweenBuilds=true
-# Generate manifest class as a .class directly rather than a Java source file.
-android.generateManifestClass=true
-
-# Default Android build features
-# Disable resource values generation by default in libraries
-android.defaults.buildfeatures.resvalues=false
-# Disable shader compilation by default
-android.defaults.buildfeatures.shaders=false
-# Disable Android resource processing by default
-android.library.defaults.buildfeatures.androidresources=false
-
-# Suppress warnings for some features that aren't yet stabilized
-android.suppressUnsupportedOptionWarnings=android.keepWorkerActionServicesBetweenBuilds,\
-  android.enableAppCompileTimeRClass,\
-  android.suppressUnsupportedOptionWarnings
-
 # OSSRH sometimes struggles with slow deployments, so this makes Gradle
 # more tolerant to those delays.
 systemProp.org.gradle.internal.http.connectionTimeout=500000

gradle/libs.versions.toml

@@ -1,17 +1,16 @@
 [versions]
-agp = "8.13.2"
-kotlin = "2.3.0"
+agp = "9.1.0"
 
 [libraries]
-androidx-activity-ktx = "androidx.activity:activity-ktx:1.12.2"
+androidx-activity-ktx = "androidx.activity:activity-ktx:1.13.0"
 androidx-annotation = "androidx.annotation:annotation:1.9.1"
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.1"
 androidx-biometric = "androidx.biometric:biometric:1.1.0"
-androidx-collection = "androidx.collection:collection:1.5.0"
+androidx-collection = "androidx.collection:collection:1.6.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
 androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.3.0"
-androidx-core-ktx = "androidx.core:core-ktx:1.17.0"
-androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.2.0"
+androidx-core-ktx = "androidx.core:core-ktx:1.18.0"
+androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.2.1"
 androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.9"
 androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.10.0"
 androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1"
@@ -25,5 +24,4 @@ zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0"
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+legacy-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

ui/build.gradle.kts

@@ -1,14 +1,10 @@
 @file:Suppress("UnstableApiUsage")
 
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 val pkg: String = providers.gradleProperty("wireguardPackageName").get()
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.legacy.kapt)
 }
 
 android {
@@ -22,7 +18,6 @@ android {
     defaultConfig {
         applicationId = pkg
         minSdk = 24
-        targetSdk = 36
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()
         buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString())
@@ -87,7 +82,3 @@ tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-Xlint:unchecked")
     options.isDeprecation = true
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-    compilerOptions.jvmTarget = JvmTarget.JVM_17
-}